On 2012-08-21 02:17, Jan Beich wrote:
...
Time to revert r228540?
Index: contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
===================================================================
--- contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h (revision
239467)
+++ contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h (working copy)
@@ -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
Well, if Jason would like to support upstream jemalloc for different
versions of clang, it is probably better to to use __has_feature()
instead.
Jason, what do you think of the attached patch? Or could we just remove
the whole #ifdef __clang__ part?
Index: contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
===================================================================
--- contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h (revision 239463)
+++ contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h (working copy)
@@ -56,9 +56,9 @@
#ifndef JEMALLOC_TLS_MODEL
# define JEMALLOC_TLS_MODEL /* Default. */
#endif
-#ifdef __clang__
+#if defined(__clang__) && !__has_feature(tls_model)
# undef JEMALLOC_TLS_MODEL
-# define JEMALLOC_TLS_MODEL /* clang does not support tls_model yet. */
+# define JEMALLOC_TLS_MODEL /* This clang does not support tls_model. */
#endif
#define STATIC_PAGE_SHIFT PAGE_SHIFT
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
