summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/jemalloc/FREEBSD-diffs6
-rw-r--r--contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h4
2 files changed, 1 insertions, 9 deletions
diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs
index e38ff91..8ca4995 100644
--- a/contrib/jemalloc/FREEBSD-diffs
+++ b/contrib/jemalloc/FREEBSD-diffs
@@ -125,7 +125,7 @@ new file mode 100644
index 0000000..9efab93
--- /dev/null
+++ b/include/jemalloc/jemalloc_FreeBSD.h
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,76 @@
+/*
+ * Override settings that were generated in jemalloc_defs.h as necessary.
+ */
@@ -184,10 +184,6 @@ index 0000000..9efab93
+#ifndef JEMALLOC_TLS_MODEL
+# define JEMALLOC_TLS_MODEL /* Default. */
+#endif
-+#ifdef __clang__
-+# undef JEMALLOC_TLS_MODEL
-+# define JEMALLOC_TLS_MODEL /* clang does not support tls_model yet. */
-+#endif
+
+#define STATIC_PAGE_SHIFT PAGE_SHIFT
+#define LG_SIZEOF_INT 2
diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
index 9efab93..9c97a13 100644
--- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
+++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
@@ -56,10 +56,6 @@
#ifndef JEMALLOC_TLS_MODEL
# define JEMALLOC_TLS_MODEL /* Default. */
#endif
-#ifdef __clang__
-# undef JEMALLOC_TLS_MODEL
-# define JEMALLOC_TLS_MODEL /* clang does not support tls_model yet. */
-#endif
#define STATIC_PAGE_SHIFT PAGE_SHIFT
#define LG_SIZEOF_INT 2
OpenPOWER on IntegriCloud