[llvm-branch-commits] [llvm-gcc-branch] r79265 - in /llvm-gcc-4.2/branches/Apple/Leela: GNUmakefile build_gcc

[Bill Wendling]

Author: void
Date: Mon Aug 17 13:51:19 2009
New Revision: 79265

URL: http://llvm.org/viewvc/llvm-project?rev=79265&view=rev
Log:
$ svn merge -c 79231 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r79231 into '.':
U    GNUmakefile
U    build_gcc


Modified:
    llvm-gcc-4.2/branches/Apple/Leela/GNUmakefile
    llvm-gcc-4.2/branches/Apple/Leela/build_gcc

Modified: llvm-gcc-4.2/branches/Apple/Leela/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Leela/GNUmakefile?rev=79265&r1=79264&r2=79265&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Leela/GNUmakefile (original)
+++ llvm-gcc-4.2/branches/Apple/Leela/GNUmakefile Mon Aug 17 13:51:19 2009
@@ -33,6 +33,9 @@
 RC_ARCHS := ppc i386
 HOSTS = $(RC_ARCHS)
 targets = echo $(RC_ARCHS)
+ifeq ($(RC_ProjectName),llvmgcc42_Embedded)
+targets += arm
+endif
 TARGETS := $(shell $(targets))
 
 SRCROOT = .

Modified: llvm-gcc-4.2/branches/Apple/Leela/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Leela/build_gcc?rev=79265&r1=79264&r2=79265&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Leela/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Leela/build_gcc Mon Aug 17 13:51:19 2009
@@ -171,7 +171,9 @@
     echo "Error: $ARM_TOOLROOT directory is not installed"
     exit 1
   fi
-  if [ "x$ARM_MULTILIB_ARCHS" = "x" ] ; then
+  if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
+    ARM_MULTILIB_ARCHS=${ARCH_OPTIONS}
+  elif [ "x$ARM_MULTILIB_ARCHS" = "x" ] ; then
     ARM_MULTILIB_ARCHS=`/usr/bin/lipo -info $ARM_SYSROOT/usr/lib/libSystem.dylib | cut -d':' -f 3 | sed -e 's/x86_64//' -e 's/i386//' -e 's/ppc7400//' -e 's/ppc64//' -e 's/^ *//' -e 's/ $//'`
   fi;
   if [ "x$ARM_MULTILIB_ARCHS" == "x" ] ; then