Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Apr 2012 18:41:17 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r234658 - head/contrib/jemalloc/src
Message-ID:  <201204241841.q3OIfHsV060305@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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. */



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