svn commit: r239618 - in head/contrib/jemalloc: . include/jemalloc

[Dimitry Andric]

Author: dim
Date: Thu Aug 23 17:58:22 2012
New Revision: 239618
URL: http://svn.freebsd.org/changeset/base/239618

Log:
  Since our clang now supports the tls_model attribute, remove the
  workaround for it in jemalloc_FreeBSD.h.
  
  Reviewed by:	jasone

Modified:
  head/contrib/jemalloc/FREEBSD-diffs
  head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h

Modified: head/contrib/jemalloc/FREEBSD-diffs
==============================================================================
--- head/contrib/jemalloc/FREEBSD-diffs	Thu Aug 23 17:40:20 2012	(r239617)
+++ head/contrib/jemalloc/FREEBSD-diffs	Thu Aug 23 17:58:22 2012	(r239618)
@@ -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

Modified: head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Thu Aug 23 17:40:20 2012	(r239617)
+++ head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Thu Aug 23 17:58:22 2012	(r239618)
@@ -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