From owner-svn-src-head@FreeBSD.ORG  Mon Jul 18 20:07:29 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 84351106567C;
	Mon, 18 Jul 2011 20:07:29 +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 747F88FC14;
	Mon, 18 Jul 2011 20:07:29 +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 p6IK7T7t037524;
	Mon, 18 Jul 2011 20:07:29 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6IK7Thi037522;
	Mon, 18 Jul 2011 20:07:29 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201107182007.p6IK7Thi037522@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 18 Jul 2011 20:07:29 +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: r224201 - 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: Mon, 18 Jul 2011 20:07:29 -0000

Author: dim
Date: Mon Jul 18 20:07:29 2011
New Revision: 224201
URL: http://svn.freebsd.org/changeset/base/224201

Log:
  Fix building of 32-bit compat libraries on amd64 with clang, and using
  -g, by reverting r219139.  The LLVM PR referenced in that revision was
  fixed in the mean time, and we imported a clang snapshot soon
  afterwards, so the temporary workaround of disabling clang's integrated
  assembler is no longer needed.
  
  In this particular case, using e.g. DEBUG_FLAGS=-g causes clang to
  output certain directives into assembly that our version of GNU as
  chokes on.
  
  Reported by:	dougb
  Approved by:	re (kib)

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

Modified: head/lib/libc/stdlib/Makefile.inc
==============================================================================
--- head/lib/libc/stdlib/Makefile.inc	Mon Jul 18 20:06:49 2011	(r224200)
+++ head/lib/libc/stdlib/Makefile.inc	Mon Jul 18 20:07:29 2011	(r224201)
@@ -51,7 +51,3 @@ 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