[llvm-commits] [llvm-gcc-4.2] r110501 - in /llvm-gcc-4.2/trunk: ChangeLog.apple Makefile.in build_gcc

[Bob Wilson]

Author: bwilson
Date: Sat Aug  7 00:14:16 2010
New Revision: 110501

URL: http://llvm.org/viewvc/llvm-project?rev=110501&view=rev
Log:
Radar 8283838: Merge fix for <rdar://problem/8277973> from gcc-4.2

Modified:
    llvm-gcc-4.2/trunk/ChangeLog.apple
    llvm-gcc-4.2/trunk/Makefile.in
    llvm-gcc-4.2/trunk/build_gcc

Modified: llvm-gcc-4.2/trunk/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/ChangeLog.apple?rev=110501&r1=110500&r2=110501&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/ChangeLog.apple Sat Aug  7 00:14:16 2010
@@ -1,3 +1,9 @@
+2010-08-06  Bob Wilson  <bob.wilson at apple.com>
+
+	Radar 8277973
+	* Makefile.in (FLAGS_FOR_TARGET): Add $(SYSROOT_CFLAGS_FOR_TARGET).
+	* build_gcc: Configure for powerpc using --with-build-sysroot.
+
 2010-07-29  Bob Wilson  <bob.wilson at apple.com>
 	
 	Radar 7982386

Modified: llvm-gcc-4.2/trunk/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/Makefile.in?rev=110501&r1=110500&r2=110501&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/Makefile.in Sat Aug  7 00:14:16 2010
@@ -308,7 +308,8 @@
 # Programs producing files for the TARGET machine
 # -----------------------------------------------
 
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+# APPLE LOCAL 8277973 Add sysroot flag here.
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ $(SYSROOT_CFLAGS_FOR_TARGET)
 
 AR_FOR_TARGET=@AR_FOR_TARGET@
 AS_FOR_TARGET=@AS_FOR_TARGET@

Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=110501&r1=110500&r2=110501&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Sat Aug  7 00:14:16 2010
@@ -118,6 +118,10 @@
 NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=/usr/include/c++/$LIBSTDCXX_VERSION"
 # LLVM LOCAL end
 
+# Build against the MacOSX10.5 SDK for PowerPC.
+PPC_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
+PPC_CONFIGFLAGS="$NON_ARM_CONFIGFLAGS --with-build-sysroot=\"$PPC_SYSROOT\""
+
 DARWIN_VERS=`uname -r | sed 's/\..*//'`
 echo DARWIN_VERS = $DARWIN_VERS
 
@@ -359,6 +363,8 @@
       AS_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-as \
       LD_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-ld \
       $SRC_DIR/configure $T_CONFIGFLAGS $ARM_CONFIGFLAGS || exit 1
+    elif [ $t = 'powerpc' ] ; then
+      $SRC_DIR/configure $T_CONFIGFLAGS $PPC_CONFIGFLAGS || exit 1
     else
       $SRC_DIR/configure $T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS || exit 1
     fi
@@ -420,6 +426,8 @@
           --target=$t-apple-darwin$DARWIN_VERS"
 	if [ $t = 'arm' ] && [ $h != 'arm' ] ; then
           T_CONFIGFLAGS="$T_CONFIGFLAGS $ARM_CONFIGFLAGS"
+	elif [ $t = 'powerpc' ] && [ $h != 'powerpc' ] ; then
+          T_CONFIGFLAGS="$T_CONFIGFLAGS $PPC_CONFIGFLAGS"
         else
           T_CONFIGFLAGS="$T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS"
         fi