From owner-svn-src-head@FreeBSD.ORG  Thu Aug 23 17:58:23 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80420106566B;
	Thu, 23 Aug 2012 17:58:23 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BBE28FC0A;
	Thu, 23 Aug 2012 17:58:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7NHwN3u069914;
	Thu, 23 Aug 2012 17:58:23 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7NHwNk8069911;
	Thu, 23 Aug 2012 17:58:23 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208231758.q7NHwNk8069911@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 23 Aug 2012 17:58:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239618 - in head/contrib/jemalloc: . include/jemalloc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2012 17:58:23 -0000

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