[llvm-branch-commits] [llvm-gcc-branch] r107063 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ ChangeLog.apple build_gcc gcc/ChangeLog.apple gcc/config/arm/darwin.h

Mon Jun 28 13:44:48 PDT 2010

Author: grosbach
Date: Mon Jun 28 15:44:48 2010
New Revision: 107063

URL: http://llvm.org/viewvc/llvm-project?rev=107063&view=rev
Log:
merge 107062

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/ChangeLog.apple
    llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------

--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 15:44:48 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062

Modified: llvm-gcc-4.2/branches/Apple/Morbo/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/ChangeLog.apple?rev=107063&r1=107062&r2=107063&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/ChangeLog.apple (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/ChangeLog.apple Mon Jun 28 15:44:48 2010
@@ -1,3 +1,9 @@
+2010-06-28 Jim Grosbach <grosbach at apple.com>
+
+	Radar 7449793
+	* build_gcc: Set DEFAULT_TARGET_OS to iOS when specified, OSX
+	otherwise.
+
 2009-05-27  Bob Wilson  <bob.wilson at apple.com>
 
 	Radar 6915254

Modified: llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/build_gcc?rev=107063&r1=107062&r2=107063&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Mon Jun 28 15:44:48 2010
@@ -125,6 +125,12 @@
 ARM_LIBSTDCXX_VERSION=4.2.1
 ARM_CONFIGFLAGS="--with-gxx-include-dir=/usr/include/c++/$ARM_LIBSTDCXX_VERSION"
 
+# When building for a non-embedded train, ARM defaults to MacOSX, just like
+# x86 and ppc.
+if [ "x$RC_TARGET_CONFIG" = "xiPhone" ]; then
+  ARM_DARWIN_TARGET_IPHONEOS="YES"
+fi
+
 if [ -n "$ARM_SDK" ]; then
   ARM_PLATFORM=`xcodebuild -version -sdk $ARM_SDK PlatformPath`
   ARM_SYSROOT=`xcodebuild -version -sdk $ARM_SDK Path`
@@ -366,9 +372,20 @@
     fi
     # APPLE LOCAL end ARM ARM_CONFIGFLAGS
    fi
-   make $MAKEFLAGS all CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1
+   if [ $t = 'arm' ] ; then
+     if [ $ARM_DARWIN_TARGET_IPHONEOS = 'YES' ] ; then
+       DEFAULT_TARGET="-DDEFAULT_TARGET_OS=DARWIN_VERSION_IPHONEOS"
+     else
+        DEFAULT_TARGET="-DDEFAULT_TARGET_OS=DARWIN_VERSION_MACOSX"
+     fi
+   else
+     DEFAULT_TARGET=""
+   fi
+   make $MAKEFLAGS all CFLAGS="$CFLAGS $DEFAULT_TARGET" \
+     CXXFLAGS="$CFLAGS $DEFAULT_TARGET" || exit 1
    make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-$t install-gcc install-target \
-     CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" || exit 1
+     CFLAGS="$CFLAGS $DEFAULT_TARGET" \
+     CXXFLAGS="$CFLAGS $DEFAULT_TARGET" | exit 1
 
    # Add the compiler we just built to the path.
    # LLVM LOCAL Support for non /usr $DEST_ROOT

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple?rev=107063&r1=107062&r2=107063&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple Mon Jun 28 15:44:48 2010
@@ -1,3 +1,10 @@
+2010-06-28 Jim Grosbach <grosbach at apple.com>
+
+	Radar 7449793
+	* config/arm/darwin.h (DEFAULT_TARGET_OS): New.
+	(DARWIN_DEFAULT_VERSION_TYPE): OSX or iOS, depending on setting of
+	DEFAULT_TARGET_OS.
+
 2010-03-16  Fariborz Jahanian <fjahanian at apple.com>
 
         Radar 7760213

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h?rev=107063&r1=107062&r2=107063&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h Mon Jun 28 15:44:48 2010
@@ -247,7 +247,11 @@
 #define DARWIN_LD_MINVERSION_SPEC "-iphoneos_version_min %(darwin_minversion)"
 
 /* Use iPhone OS version numbers by default.  */
+#ifdef DEFAULT_TARGET_OS
+#define DARWIN_DEFAULT_VERSION_TYPE  DEFAULT_TARGET_OS
+#else
 #define DARWIN_DEFAULT_VERSION_TYPE  DARWIN_VERSION_IPHONEOS
+#endif
 
 #define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.1 -lgcc"
 



