$ svn merge -c 79932 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r79932 into '.':
U build_gcc
llvm-svn: 79939
diff --git a/llvm-gcc-4.2/build_gcc b/llvm-gcc-4.2/build_gcc
index 5a6bb76..5a4443d 100755
--- a/llvm-gcc-4.2/build_gcc
+++ b/llvm-gcc-4.2/build_gcc
@@ -170,7 +170,7 @@
exit 1
fi
if [ "x$RC_ProjectName" = "xllvmgcc42_Embedded" ]; then
- ARM_MULTILIB_ARCHS=${ARCH_OPTIONS}
+ ARM_MULTILIB_ARCHS="armv6 armv7"
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;