Revert the change to use RC_SUPPORTED_ARCHS in this version of llvm-gcc.
<rdar://problem/10386121>

--- Reverse-merging r140790 into '.':
U    GNUmakefile
U    build_gcc
 U   .

llvm-svn: 143577
diff --git a/llvm-gcc-4.2/GNUmakefile b/llvm-gcc-4.2/GNUmakefile
index b3be7ec..89dcb10 100644
--- a/llvm-gcc-4.2/GNUmakefile
+++ b/llvm-gcc-4.2/GNUmakefile
@@ -34,11 +34,6 @@
 HOSTS = $(RC_ARCHS)
 targets = echo $(RC_ARCHS)
 TARGETS := $(shell $(targets))
-ifneq ($(strip $(RC_SUPPORTED_ARCHS)),)
-TGT_ARCHS := $(shell echo $(RC_SUPPORTED_ARCHS))
-else
-TGT_ARCHS := $(shell echo $(TARGETS))
-endif
 
 SRCROOT = .
 
@@ -104,14 +99,14 @@
 	fi
 	cd $(OBJROOT) && \
 	  DEVELOPER_DIR=Developer \
-	  $(SRC)/llvmCore/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TGT_ARCHS)"\
+	  $(SRC)/llvmCore/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC)/llvmCore /usr/local $(DSTROOT) $(SYMROOT) \
 	    $(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) $(INSTALL_LIBLTO) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
 
 llvmgcc42: $(OBJROOT) $(SYMROOT) $(DSTROOT)
 	cd $(OBJROOT) && \
-	  $(SRC)/build_gcc "$(RC_ARCHS)" "$(TGT_ARCHS)" \
+	  $(SRC)/build_gcc "$(RC_ARCHS)" "$(TARGETS)" \
 	    $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(INSTALL_LIBLTO) \
 	    $(ENABLE_ASSERTIONS) $(LLVMCORE_PATH) \
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
diff --git a/llvm-gcc-4.2/build_gcc b/llvm-gcc-4.2/build_gcc
index 34c99f2..680e3cd 100755
--- a/llvm-gcc-4.2/build_gcc
+++ b/llvm-gcc-4.2/build_gcc
@@ -15,33 +15,13 @@
 # The first parameter is a space-separated list of the architectures
 # the compilers will run on.  For instance, "ppc i386".  If the
 # current machine isn't in the list, it will (effectively) be added.
-ORIG_HOSTS=$1
-HOSTS=`echo $ORIG_HOSTS | $TRANSLATE_ARCH `
+HOSTS=`echo $1 | $TRANSLATE_ARCH `
 
 # The second parameter is a space-separated list of the architectures the
 # compilers will generate code for.  If the current machine isn't in
 # the list, a compiler for it will get built anyway, but won't be
 # installed.
-for t in $2; do
-  if echo $t | grep arm; then
-    # Do not include a generic "arm" target in the list of ARM variants.
-    if [ "$t" != arm ]; then
-      ARM_ARCHS="$ARM_ARCHS $t"
-    fi
-  else
-    ORIG_TARGETS="$ORIG_TARGETS $t"
-  fi
-done
-# If the list of targets included specific ARM variants, e.g., as specified
-# by RC_SUPPORTED_ARCHS, then use those as list of ARM multilibs to build.
-if [ -n "$ARM_ARCHS" ]; then
-  ARM_MULTILIB_ARCHS=$ARM_ARCHS
-fi
-# Combine all the different ARM variants to a single "arm" target.
-if echo $2 | grep arm; then
-  ORIG_TARGETS="$ORIG_TARGETS arm"
-fi
-TARGETS=`echo $ORIG_TARGETS | $TRANSLATE_ARCH | $OMIT_X86_64 | sed -e s,\\',,g`
+TARGETS=`echo $2 | $TRANSLATE_ARCH | $OMIT_X86_64 | sed -e s,\\',,g`
 
 # The GNU makefile target ('bootstrap' by default).
 BOOTSTRAP=${BOOTSTRAP-bootstrap}
@@ -350,10 +330,10 @@
     chmod a+x $P || exit 1
   done
 done
-# The "as" script adds a default "-arch" option.  Iterate over the
-# ORIG_HOSTS and ORIG_TARGETS so those names can be used as
+# The "as" script adds a default "-arch" option.  Iterate over the lists of
+# untranslated HOSTS and TARGETS in $1 and $2 so those names can be used as
 # the arguments for "-arch" in the scripts.
-for t in `echo $ORIG_HOSTS $ORIG_TARGETS | tr ' ' '\n' | sort -u`; do
+for t in `echo $1 $2 | tr ' ' '\n' | sort -u`; do
   gt=`echo $t | $TRANSLATE_ARCH`
   P=$DIR/bin/${gt}-apple-darwin$DARWIN_VERS-as
   if [ "$gt" = "arm" -a -n "$ARM_SDK" ]; then