[llvm-branch-commits] [llvm-gcc-branch] r140790 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ GNUmakefile build_gcc
Bob Wilson
bob.wilson at apple.com
Thu Sep 29 10:18:31 PDT 2011
Author: bwilson
Date: Thu Sep 29 12:18:30 2011
New Revision: 140790
URL: http://llvm.org/viewvc/llvm-project?rev=140790&view=rev
Log:
Change the Apple-style build script to recognize a new RC_SUPPORTED_ARCHS
setting that specifies both the TARGETS and the ARM_MULTILIB_ARCHS.
rdar://9852476
--- Merging r140780 into '.':
U GNUmakefile
U build_gcc
Modified:
llvm-gcc-4.2/branches/Apple/Morbo/ (props changed)
llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile
llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 12:18:30 2011
@@ -1,2 +1,2 @@
/llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105535,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749,120922,127261-127262,127309,128016,128619,129022,129946,129957,135848
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99262,99305,99412,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101614,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105535,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,113248,114961,118368,118749,120922,127261-127262,127309,128016,128619,129022,129946,129957,135848,140780
Modified: llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile?rev=140790&r1=140789&r2=140790&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile Thu Sep 29 12:18:30 2011
@@ -34,6 +34,11 @@
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 = .
@@ -99,14 +104,14 @@
fi
cd $(OBJROOT) && \
DEVELOPER_DIR=Developer \
- $(SRC)/llvmCore/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
+ $(SRC)/llvmCore/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TGT_ARCHS)"\
$(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)" "$(TARGETS)" \
+ $(SRC)/build_gcc "$(RC_ARCHS)" "$(TGT_ARCHS)" \
$(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(INSTALL_LIBLTO) \
$(ENABLE_ASSERTIONS) $(LLVMCORE_PATH) \
$(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)
Modified: llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/build_gcc?rev=140790&r1=140789&r2=140790&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Thu Sep 29 12:18:30 2011
@@ -15,13 +15,33 @@
# 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.
-HOSTS=`echo $1 | $TRANSLATE_ARCH `
+ORIG_HOSTS=$1
+HOSTS=`echo $ORIG_HOSTS | $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.
-TARGETS=`echo $2 | $TRANSLATE_ARCH | $OMIT_X86_64 | sed -e s,\\',,g`
+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`
# The GNU makefile target ('bootstrap' by default).
BOOTSTRAP=${BOOTSTRAP-bootstrap}
@@ -330,10 +350,10 @@
chmod a+x $P || exit 1
done
done
-# 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 "as" script adds a default "-arch" option. Iterate over the
+# ORIG_HOSTS and ORIG_TARGETS so those names can be used as
# the arguments for "-arch" in the scripts.
-for t in `echo $1 $2 | tr ' ' '\n' | sort -u`; do
+for t in `echo $ORIG_HOSTS $ORIG_TARGETS | 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
More information about the llvm-branch-commits
mailing list