Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Aug 2012 10:39:51 +0200
From:      Dimitry Andric <dim@FreeBSD.org>
To:        Jan Beich <jbeich@tormail.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Jason Evans <jasone@freebsd.org>
Subject:   jemalloc and clang (was: Re: svn commit: r239462 - in head)
Message-ID:  <50334957.6020201@FreeBSD.org>
In-Reply-To: <1T3c9K-000Jlb-7g@internal.tormail.org>
References:  <201208201833.q7KIX58p075876@svn.freebsd.org> <1T3c9K-000Jlb-7g@internal.tormail.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------010001080807070805040402
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

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?

--------------010001080807070805040402
Content-Type: text/x-diff;
 name="jemalloc-clang-tlsmodel-1.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="jemalloc-clang-tlsmodel-1.diff"

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

--------------010001080807070805040402--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50334957.6020201>