From owner-svn-src-head@FreeBSD.ORG  Mon Jun 14 06:23:48 2010
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 46FF8106564A;
	Mon, 14 Jun 2010 06:23:48 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 367BA8FC19;
	Mon, 14 Jun 2010 06:23:48 +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 o5E6Nl5U067863;
	Mon, 14 Jun 2010 06:23:47 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5E6Nl4w067862;
	Mon, 14 Jun 2010 06:23:47 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201006140623.o5E6Nl4w067862@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 14 Jun 2010 06:23:47 +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: r209153 - head/lib/clang
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, 14 Jun 2010 06:23:48 -0000

Author: ed
Date: Mon Jun 14 06:23:47 2010
New Revision: 209153
URL: http://svn.freebsd.org/changeset/base/209153

Log:
  Unbreak Clang on PowerPC.
  
  It seems GCC 4.2.1 on PowerPC miscompiles Clang, causing it to crash
  when building even simple Hello World applications. Switch back to -O1
  for this architecture.
  
  Submitted by:	nwhitehorn

Modified:
  head/lib/clang/clang.build.mk

Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk	Mon Jun 14 02:56:45 2010	(r209152)
+++ head/lib/clang/clang.build.mk	Mon Jun 14 06:23:47 2010	(r209153)
@@ -8,11 +8,16 @@ CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG
 	-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
 	-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
 
+# Correct for gcc miscompilation when compiling on PPC with -O2
+.if ${MACHINE_ARCH} == "powerpc"
+CFLAGS+= -O1
+.endif
+
 TARGET_ARCH?=	${MACHINE_ARCH}
 # XXX: 8.0, to keep __FreeBSD_cc_version happy
 CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\" \
 	-DCLANG_VENDOR=\"FreeBSD\ \" -DSVN_REVISION=\"104832\" \
-	-DCLANG_VENDOR_SUFFIX=\"\ 20100613\"
+	-DCLANG_VENDOR_SUFFIX=\"\ 20100614\"
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}