[llvm-commits] [llvm-gcc-4.2] r107062 - in /llvm-gcc-4.2/trunk: ChangeLog.apple build_gcc gcc/ChangeLog.apple gcc/config/arm/darwin.h
Jim Grosbach
grosbach at apple.com
Mon Jun 28 13:41:34 PDT 2010
Author: grosbach
Date: Mon Jun 28 15:41:34 2010
New Revision: 107062
URL: http://llvm.org/viewvc/llvm-project?rev=107062&view=rev
Log:
Cleanup ARM build script to be more consistent about defaults.
Modified:
llvm-gcc-4.2/trunk/ChangeLog.apple
llvm-gcc-4.2/trunk/build_gcc
llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h
Modified: llvm-gcc-4.2/trunk/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/ChangeLog.apple?rev=107062&r1=107061&r2=107062&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/ChangeLog.apple Mon Jun 28 15:41:34 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/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=107062&r1=107061&r2=107062&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Mon Jun 28 15:41:34 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_SYSROOT=`xcodebuild -version -sdk $ARM_SDK Path`
else
@@ -357,9 +363,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/trunk/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ChangeLog.apple?rev=107062&r1=107061&r2=107062&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/ChangeLog.apple Mon Jun 28 15:41:34 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/trunk/gcc/config/arm/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h?rev=107062&r1=107061&r2=107062&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h Mon Jun 28 15:41:34 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"
More information about the llvm-commits
mailing list