[llvm-commits] [llvm-gcc-4.2] r80172 - in /llvm-gcc-4.2/trunk: GNUmakefile build_gcc

[Bob Wilson]

Author: bwilson
Date: Wed Aug 26 17:59:04 2009
New Revision: 80172

URL: http://llvm.org/viewvc/llvm-project?rev=80172&view=rev
Log:
Revert 79231 and 79932.  They were temporary workarounds for Apple-style builds
and are no longer needed.

Modified:
    llvm-gcc-4.2/trunk/GNUmakefile
    llvm-gcc-4.2/trunk/build_gcc

Modified: llvm-gcc-4.2/trunk/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/GNUmakefile?rev=80172&r1=80171&r2=80172&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/GNUmakefile (original)
+++ llvm-gcc-4.2/trunk/GNUmakefile Wed Aug 26 17:59:04 2009
@@ -33,9 +33,6 @@
 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/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=80172&r1=80171&r2=80172&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Wed Aug 26 17:59:04 2009
@@ -169,9 +169,7 @@
     echo "Error: $ARM_TOOLROOT directory is not installed"
     exit 1
   fi
-  if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
-    ARM_MULTILIB_ARCHS="armv6 armv7"
-  elif [ "x$ARM_MULTILIB_ARCHS" = "x" ] ; then
+  if [ "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