| FREEBSD-diffs (251300) | FREEBSD-diffs (256823) |
|---|---|
| 1diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in 2index abd5e6f..1d7491a 100644 3--- a/doc/jemalloc.xml.in 4+++ b/doc/jemalloc.xml.in 5@@ -51,12 +51,23 @@ 6 <para>This manual describes jemalloc @jemalloc_version@. More information 7 can be found at the <ulink 8 url="http://www.canonware.com/jemalloc/">jemalloc website</ulink>.</para> --- 31 unchanged lines hidden (view full) --- 40+ <para>The <function>aligned_alloc<parameter/></function>, 41+ <function>malloc_stats_print<parameter/></function>, 42+ <function>mallctl*<parameter/></function>, and 43+ <function>*allocm<parameter/></function> functions first appeared in 44+ FreeBSD 10.0.</para> 45+ </refsect1> 46 </refentry> 47diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in | 1diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in 2index abd5e6f..1d7491a 100644 3--- a/doc/jemalloc.xml.in 4+++ b/doc/jemalloc.xml.in 5@@ -51,12 +51,23 @@ 6 <para>This manual describes jemalloc @jemalloc_version@. More information 7 can be found at the <ulink 8 url="http://www.canonware.com/jemalloc/">jemalloc website</ulink>.</para> --- 31 unchanged lines hidden (view full) --- 40+ <para>The <function>aligned_alloc<parameter/></function>, 41+ <function>malloc_stats_print<parameter/></function>, 42+ <function>mallctl*<parameter/></function>, and 43+ <function>*allocm<parameter/></function> functions first appeared in 44+ FreeBSD 10.0.</para> 45+ </refsect1> 46 </refentry> 47diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in |
| 48index e46ac54..527449d 100644 | 48index 53c135c..c547339 100644 |
| 49--- a/include/jemalloc/internal/jemalloc_internal.h.in 50+++ b/include/jemalloc/internal/jemalloc_internal.h.in 51@@ -1,5 +1,8 @@ 52 #ifndef JEMALLOC_INTERNAL_H 53 #define JEMALLOC_INTERNAL_H 54+#include "libc_private.h" 55+#include "namespace.h" 56+ --- 35 unchanged lines hidden (view full) --- 92 extern bool isthreaded; 93-#else 94-# undef isthreaded /* Undo private_namespace.h definition. */ 95-# define isthreaded true 96 #endif 97 98 bool malloc_mutex_init(malloc_mutex_t *mutex); 99diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h | 49--- a/include/jemalloc/internal/jemalloc_internal.h.in 50+++ b/include/jemalloc/internal/jemalloc_internal.h.in 51@@ -1,5 +1,8 @@ 52 #ifndef JEMALLOC_INTERNAL_H 53 #define JEMALLOC_INTERNAL_H 54+#include "libc_private.h" 55+#include "namespace.h" 56+ --- 35 unchanged lines hidden (view full) --- 92 extern bool isthreaded; 93-#else 94-# undef isthreaded /* Undo private_namespace.h definition. */ 95-# define isthreaded true 96 #endif 97 98 bool malloc_mutex_init(malloc_mutex_t *mutex); 99diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h |
| 100index 65de316..366676b 100644 | 100index cdb0b0e..2a98d1f 100644 |
| 101--- a/include/jemalloc/internal/private_namespace.h 102+++ b/include/jemalloc/internal/private_namespace.h | 101--- a/include/jemalloc/internal/private_namespace.h 102+++ b/include/jemalloc/internal/private_namespace.h |
| 103@@ -216,7 +216,6 @@ | 103@@ -218,7 +218,6 @@ |
| 104 #define iralloc JEMALLOC_N(iralloc) 105 #define irallocx JEMALLOC_N(irallocx) 106 #define isalloc JEMALLOC_N(isalloc) 107-#define isthreaded JEMALLOC_N(isthreaded) 108 #define ivsalloc JEMALLOC_N(ivsalloc) 109 #define jemalloc_postfork_child JEMALLOC_N(jemalloc_postfork_child) 110 #define jemalloc_postfork_parent JEMALLOC_N(jemalloc_postfork_parent) 111diff --git a/include/jemalloc/jemalloc.h.in b/include/jemalloc/jemalloc.h.in --- 127 unchanged lines hidden (view full) --- 239+__weak_reference(__allocm, allocm); 240+__weak_reference(__rallocm, rallocm); 241+__weak_reference(__sallocm, sallocm); 242+__weak_reference(__dallocm, dallocm); 243+__weak_reference(__nallocm, nallocm); 244+#endif 245+ 246diff --git a/src/jemalloc.c b/src/jemalloc.c | 104 #define iralloc JEMALLOC_N(iralloc) 105 #define irallocx JEMALLOC_N(irallocx) 106 #define isalloc JEMALLOC_N(isalloc) 107-#define isthreaded JEMALLOC_N(isthreaded) 108 #define ivsalloc JEMALLOC_N(ivsalloc) 109 #define jemalloc_postfork_child JEMALLOC_N(jemalloc_postfork_child) 110 #define jemalloc_postfork_parent JEMALLOC_N(jemalloc_postfork_parent) 111diff --git a/include/jemalloc/jemalloc.h.in b/include/jemalloc/jemalloc.h.in --- 127 unchanged lines hidden (view full) --- 239+__weak_reference(__allocm, allocm); 240+__weak_reference(__rallocm, rallocm); 241+__weak_reference(__sallocm, sallocm); 242+__weak_reference(__dallocm, dallocm); 243+__weak_reference(__nallocm, nallocm); 244+#endif 245+ 246diff --git a/src/jemalloc.c b/src/jemalloc.c |
| 247index bc350ed..352c98e 100644 | 247index ae56db6..1412a5e 100644 |
| 248--- a/src/jemalloc.c 249+++ b/src/jemalloc.c 250@@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) 251 malloc_tsd_data(, thread_allocated, thread_allocated_t, 252 THREAD_ALLOCATED_INITIALIZER) 253 254+/* Work around <http://llvm.org/bugs/show_bug.cgi?id=12623>: */ 255+const char *__malloc_options_1_0 = NULL; --- 64 unchanged lines hidden --- | 248--- a/src/jemalloc.c 249+++ b/src/jemalloc.c 250@@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) 251 malloc_tsd_data(, thread_allocated, thread_allocated_t, 252 THREAD_ALLOCATED_INITIALIZER) 253 254+/* Work around <http://llvm.org/bugs/show_bug.cgi?id=12623>: */ 255+const char *__malloc_options_1_0 = NULL; --- 64 unchanged lines hidden --- |