From owner-svn-src-all@FreeBSD.ORG  Sat Dec 31 12:58:22 2011
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 635D1106564A;
	Sat, 31 Dec 2011 12:58:22 +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 4D12F8FC13;
	Sat, 31 Dec 2011 12:58:22 +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 pBVCwM52063737;
	Sat, 31 Dec 2011 12:58:22 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVCwMGW063735;
	Sat, 31 Dec 2011 12:58:22 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112311258.pBVCwMGW063735@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 31 Dec 2011 12:58:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229079 - stable/9/lib/libc/stdlib
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: Sat, 31 Dec 2011 12:58:22 -0000

Author: dim
Date: Sat Dec 31 12:58:21 2011
New Revision: 229079
URL: http://svn.freebsd.org/changeset/base/229079

Log:
  MFC r228540:
  
  Since clang does not support the tls_model attribute used in malloc.c
  yet (see LLVM PR 9788), and warns about it, rub it out for now.  When
  clang grows support for this attribute, I will revert this again.

Modified:
  stable/9/lib/libc/stdlib/malloc.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/stdlib/malloc.c
==============================================================================
--- stable/9/lib/libc/stdlib/malloc.c	Sat Dec 31 12:52:18 2011	(r229078)
+++ stable/9/lib/libc/stdlib/malloc.c	Sat Dec 31 12:58:21 2011	(r229079)
@@ -219,7 +219,11 @@ __FBSDID("$FreeBSD$");
 #  define LG_QUANTUM		4
 #  define LG_SIZEOF_PTR		2
 #  define CPU_SPINWAIT		__asm__ volatile("pause")
-#  define TLS_MODEL		__attribute__((tls_model("initial-exec")))
+#  ifdef __clang__
+#    define TLS_MODEL		/* clang does not support tls_model yet */
+#  else
+#    define TLS_MODEL		__attribute__((tls_model("initial-exec")))
+#  endif
 #endif
 #ifdef __ia64__
 #  define LG_QUANTUM		4
@@ -240,7 +244,11 @@ __FBSDID("$FreeBSD$");
 #  define LG_QUANTUM		4
 #  define LG_SIZEOF_PTR		3
 #  define CPU_SPINWAIT		__asm__ volatile("pause")
-#  define TLS_MODEL		__attribute__((tls_model("initial-exec")))
+#  ifdef __clang__
+#    define TLS_MODEL		/* clang does not support tls_model yet */
+#  else
+#    define TLS_MODEL		__attribute__((tls_model("initial-exec")))
+#  endif
 #endif
 #ifdef __arm__
 #  define LG_QUANTUM		3