From owner-svn-src-all@FreeBSD.ORG  Wed Aug 22 16:18:19 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 314181065670;
	Wed, 22 Aug 2012 16:18:19 +0000 (UTC)
	(envelope-from jasone@freebsd.org)
Received: from canonware.com (10140.x.rootbsd.net [204.109.63.53])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C2FE8FC08;
	Wed, 22 Aug 2012 16:18:19 +0000 (UTC)
Received: from [192.168.168.12]
	(70-91-206-178-BusName-SFBA.hfc.comcastbusiness.net [70.91.206.178])
	(using TLSv1 with cipher AES128-SHA (128/128 bits))
	(No client certificate requested)
	by canonware.com (Postfix) with ESMTPSA id 784EE28419;
	Wed, 22 Aug 2012 09:11:16 -0700 (PDT)
Content-Type: text/plain; charset=iso-8859-1
Mime-Version: 1.0 (Mac OS X Mail 6.0 \(1485\))
From: Jason Evans <jasone@freebsd.org>
In-Reply-To: <50334957.6020201@FreeBSD.org>
Date: Wed, 22 Aug 2012 09:11:15 -0700
Content-Transfer-Encoding: 7bit
Message-Id: <64C5CE7C-1AB5-4F19-A261-5A166470A12D@freebsd.org>
References: <201208201833.q7KIX58p075876@svn.freebsd.org>
	<1T3c9K-000Jlb-7g@internal.tormail.org>
	<50334957.6020201@FreeBSD.org>
To: Dimitry Andric <dim@FreeBSD.org>
X-Mailer: Apple Mail (2.1485)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, Jan Beich <jbeich@tormail.org>
Subject: Re: jemalloc and clang (was: Re: svn commit: r239462 - in head)
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2012 16:18:19 -0000

On Aug 21, 2012, at 1:39 AM, Dimitry Andric <dim@FreeBSD.org> wrote:
> 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?
> <jemalloc-clang-tlsmodel-1.diff>

I'm happy with the above patch (completely removing the #ifdef __clang__).

Jason