diff options
| author | jasone <jasone@FreeBSD.org> | 2014-03-31 17:04:04 +0000 |
|---|---|---|
| committer | jasone <jasone@FreeBSD.org> | 2014-03-31 17:04:04 +0000 |
| commit | 1ce979c62d39ed185e1c78ec4a08fbea40f68e54 (patch) | |
| tree | e426661c22bd12ce26e2912c7d5c5fd8982659e6 /contrib/jemalloc/FREEBSD-diffs | |
| parent | c7aba972417ecd5f05f92b5ebe388232bdaa7c7f (diff) | |
| download | FreeBSD-src-1ce979c62d39ed185e1c78ec4a08fbea40f68e54.zip FreeBSD-src-1ce979c62d39ed185e1c78ec4a08fbea40f68e54.tar.gz | |
Update jemalloc to version 3.6.0.
Diffstat (limited to 'contrib/jemalloc/FREEBSD-diffs')
| -rw-r--r-- | contrib/jemalloc/FREEBSD-diffs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs index e621af7..c8cc9c1 100644 --- a/contrib/jemalloc/FREEBSD-diffs +++ b/contrib/jemalloc/FREEBSD-diffs @@ -1,5 +1,5 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index c7e2e87..2bd59f0 100644 +index d8e2e71..330ba2a 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in @@ -57,12 +57,23 @@ @@ -27,7 +27,7 @@ index c7e2e87..2bd59f0 100644 <refsect2> <title>Standard API</title> <funcprototype> -@@ -2338,4 +2349,19 @@ malloc_conf = "lg_chunk:24";]]></programlisting></para> +@@ -2342,4 +2353,19 @@ malloc_conf = "lg_chunk:24";]]></programlisting></para> <para>The <function>posix_memalign<parameter/></function> function conforms to IEEE Std 1003.1-2001 (“POSIX.1”).</para> </refsect1> @@ -48,7 +48,7 @@ index c7e2e87..2bd59f0 100644 + </refsect1> </refentry> diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index d24a1fe..d101c3d 100644 +index 574bbb1..e3eafdf 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -1,5 +1,8 @@ @@ -100,10 +100,10 @@ index de44e14..564d604 100644 bool malloc_mutex_init(malloc_mutex_t *mutex); diff --git a/include/jemalloc/internal/private_symbols.txt b/include/jemalloc/internal/private_symbols.txt -index 1e64ed5..29ddba3 100644 +index 93516d2..22f9af9 100644 --- a/include/jemalloc/internal/private_symbols.txt +++ b/include/jemalloc/internal/private_symbols.txt -@@ -225,7 +225,6 @@ iralloc +@@ -226,7 +226,6 @@ iralloc iralloct iralloct_realign isalloc @@ -263,7 +263,7 @@ index f943891..47d032c 100755 +#include "jemalloc_FreeBSD.h" EOF diff --git a/src/jemalloc.c b/src/jemalloc.c -index 563d99f..42f97b4 100644 +index 204778b..9e5f2df 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) |
