From owner-svn-src-head@FreeBSD.ORG  Tue Mar  1 17:15:44 2011
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 E24511065673;
	Tue,  1 Mar 2011 17:15:44 +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 D11788FC14;
	Tue,  1 Mar 2011 17:15:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p21HFiAm043253;
	Tue, 1 Mar 2011 17:15:44 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p21HFiDB043251;
	Tue, 1 Mar 2011 17:15:44 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201103011715.p21HFiDB043251@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 1 Mar 2011 17:15:44 +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: r219139 - head/lib/libc/stdlib
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: Tue, 01 Mar 2011 17:15:45 -0000

Author: dim
Date: Tue Mar  1 17:15:44 2011
New Revision: 219139
URL: http://svn.freebsd.org/changeset/base/219139

Log:
  Put in a temporary workaround for ctfmerge hanging on processing
  kernel.debug (or possibly other files), when WITH_CTF is active.
  
  This is caused by a bug in clang's integrated assembler, causing malloc
  to sometimes hang during initialization in statically linked executables
  that use threading, such as the copy of ctfmerge that is built during
  the bootstrap stage of buildworld.  The bug has been submitted upstream:
  
    http://llvm.org/bugs/show_bug.cgi?id=9352
  
  Note that you might have to rebuild and install libc first, to get your
  kernel build to finish, because the ctfmerge binary built during
  bootstrap is linked with your base system's copy of libc.a, which might
  already contain a bad copy of malloc.o.

Modified:
  head/lib/libc/stdlib/Makefile.inc

Modified: head/lib/libc/stdlib/Makefile.inc
==============================================================================
--- head/lib/libc/stdlib/Makefile.inc	Tue Mar  1 16:42:28 2011	(r219138)
+++ head/lib/libc/stdlib/Makefile.inc	Tue Mar  1 17:15:44 2011	(r219139)
@@ -51,3 +51,7 @@ MLINKS+=tsearch.3 tdelete.3 tsearch.3 tf
 CFLAGS+=	-DMALLOC_PRODUCTION
 .endif
 
+.if ${CC:T:Mclang} == "clang"
+# XXX: Temporary workaround for LLVM PR 9352
+CFLAGS+=	${.IMPSRC:T:Mmalloc.c:C/^.+$/-no-integrated-as/}
+.endif