From owner-svn-src-all@FreeBSD.ORG  Tue Apr 24 18:41:17 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BFF7C106566B;
	Tue, 24 Apr 2012 18:41:17 +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 AAEFA8FC08;
	Tue, 24 Apr 2012 18:41:17 +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 q3OIfHdK060307;
	Tue, 24 Apr 2012 18:41:17 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3OIfHsV060305;
	Tue, 24 Apr 2012 18:41:17 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201204241841.q3OIfHsV060305@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 24 Apr 2012 18:41:17 +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: r234658 - head/contrib/jemalloc/src
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: Tue, 24 Apr 2012 18:41:17 -0000

Author: dim
Date: Tue Apr 24 18:41:17 2012
New Revision: 234658
URL: http://svn.freebsd.org/changeset/base/234658

Log:
  Work around llvm PR 12623, which makes variables declared with .symver
  sometimes disappear from the resulting object file, if compiled with
  clang.  In particular, this can lead to errors when building world with
  clang and -g, similar to:
  
    /usr/obj/usr/src/tmp/usr/lib/libc.so: undefined reference to `_malloc_options'
  
  Reported by:	Conrad J. Sabatier <conrads@.no.cox.net>
  Reviewed by:	jasone

Modified:
  head/contrib/jemalloc/src/jemalloc.c

Modified: head/contrib/jemalloc/src/jemalloc.c
==============================================================================
--- head/contrib/jemalloc/src/jemalloc.c	Tue Apr 24 17:51:36 2012	(r234657)
+++ head/contrib/jemalloc/src/jemalloc.c	Tue Apr 24 18:41:17 2012	(r234658)
@@ -8,7 +8,8 @@ malloc_tsd_data(, arenas, arena_t *, NUL
 malloc_tsd_data(, thread_allocated, thread_allocated_t,
     THREAD_ALLOCATED_INITIALIZER)
 
-const char	*__malloc_options_1_0;
+/* Work around <http://llvm.org/bugs/show_bug.cgi?id=12623>: */
+const char	*__malloc_options_1_0 = NULL;
 __sym_compat(_malloc_options, __malloc_options_1_0, FBSD_1.0);
 
 /* Runtime configuration options. */