Revert 79231 and 79932. They were temporary workarounds for Apple-style builds
and are no longer needed.
llvm-svn: 80172
diff --git a/llvm-gcc-4.2/GNUmakefile b/llvm-gcc-4.2/GNUmakefile
index c654030..33a9df4 100644
--- a/llvm-gcc-4.2/GNUmakefile
+++ b/llvm-gcc-4.2/GNUmakefile
@@ -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 = .
diff --git a/llvm-gcc-4.2/build_gcc b/llvm-gcc-4.2/build_gcc
index 5a4443d..35deb49 100755
--- a/llvm-gcc-4.2/build_gcc
+++ b/llvm-gcc-4.2/build_gcc
@@ -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
