X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Fbuildit%2Fbuild_llvm;h=4ef7fb54015f42de4abd74962407d4d83bf888ca;hb=51cd9d6e073932fcb37f1857c66249d6c7d368ee;hp=9ce57696ca690d95b65b426f8cb8862797a33ea7;hpb=5250f1f4b0720f0fb7c01fc8340ada94ba3531aa;p=oota-llvm.git

diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm
index 9ce57696ca6..4ef7fb54015 100755
--- a/utils/buildit/build_llvm
+++ b/utils/buildit/build_llvm
@@ -34,15 +34,19 @@ DEST_DIR="$5"
 # resulting compiler.
 SYM_DIR="$6"
 
-# The seventh parameter is the version number of the submission, e.g. 1007.
-LLVM_SUBMIT_VERSION="$7"
+# The seventh parameter is a yes/no that indicates whether assertions should be
+# enabled in the LLVM libs/tools.
+LLVM_ASSERTIONS="$7"
 
-# The eighth parameter is the subversion number of the submission, e.g. 03.
-LLVM_SUBMIT_SUBVERSION="$8"
+# The eighth parameter is a yes/no that indicates whether this is an optimized
+# build.
+LLVM_OPTIMIZED="$8"
 
-# The nineth parameter is a yes/no that indicates whether assertions should be
-# enabled in the LLVM libs/tools.
-LLVM_ASSERTIONS="$9"
+# The nineth parameter is the version number of the submission, e.g. 1007.
+LLVM_SUBMIT_VERSION="$9"
+
+# The tenth parameter is the subversion number of the submission, e.g. 03.
+LLVM_SUBMIT_SUBVERSION="${10}"
 
 # The current working directory is where the build will happen. It may already
 # contain a partial result of an interrupted build, in which case this script
@@ -55,17 +59,11 @@ echo DARWIN_VERS = $DARWIN_VERS
 # If the user has CC set in their environment unset it now
 unset CC
 
-# The B&I build srcript (~rc/bin/buildit) accepts an '-othercflags' command-line
-# flag, and captures the argument to that flag in $RC_NONARCH_CFLAGS (and
-# mysteriously prepends '-pipe' thereto). We will allow this to override the
-# default $CFLAGS and $CXXFLAGS.
-
-if [ "x$LLVM_DEBUG" == "x" ]; then
-    CFLAGS="-g -O2 ${RC_NONARCH_CFLAGS/-pipe/}"
-    OPTIMIZE_OPTS="ENABLE_OPTIMIZED=1"
-else
-    CFLAGS="-g"
-    OPTIMIZE_OPTS=
+DT_HOME=$DEST_DIR/Developer/usr
+DEST_ROOT="/Developer$DEST_ROOT"
+if [ "x$DEVELOPER_BIN" != "x" ]; then
+    DT_HOME=$DEST_DIR/$DEVELOPER_DIR/usr
+    DEST_ROOT="/$DEVELOPER_DIR$DEST_ROOT"
 fi
 
 ################################################################################
@@ -84,8 +82,10 @@ mkdir -p $DIR/obj-llvm || exit 1
 cd $DIR/obj-llvm || exit 1
 
 if [ \! -f Makefile.config ]; then
-    $SRC_DIR/llvm/configure --prefix=$DEST_DIR$DEST_ROOT \
-        --enable-targets=x86,powerpc --enable-assertions=$LLVM_ASSERTIONS \
+    $SRC_DIR/llvm/configure --prefix=$DT_HOME/local \
+        --enable-targets=x86,powerpc,cbe \
+        --enable-assertions=$LLVM_ASSERTIONS \
+        --enable-optimized=$LLVM_OPTIMIZED \
         || exit 1
 fi
 
@@ -95,10 +95,41 @@ else
     LLVM_VERSION="$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION"
 fi
 
-# Note: Don't pass -jN here.  Building universal already has parallelism and we
-# don't want to make the builders hit swap by firing off too many gcc's at the
-# same time.
-make $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
+GCC_VER=`cc --version 2>/dev/null | sed 1q`
+
+if echo "$GCC_VER" | grep GCC > /dev/null; then
+    GCC_VER=`echo $GCC_VER | sed -e 's/.*(GCC) \([0-9.][0-9.]*\).*/\1/'`
+    MAJ_VER=`echo $GCC_VER | sed 's/\..*//'`
+    MIN_VER=`echo $GCC_VER | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
+fi
+
+JOBS_FLAG=""
+
+# Note: If compiling with GCC 4.0, don't pass the -jN flag. Building universal
+# already has parallelism and we don't want to make the builders hit swap by
+# firing off too many gccs at the same time.
+if [ "x$MAJ_VER" != "x4" -o "x$MIN_VER" != "x0" ]; then
+    # Figure out how many make processes to run.
+    SYSCTL=`sysctl -n hw.activecpu`
+
+    # hw.activecpu only available in 10.2.6 and later
+    if [ -z "$SYSCTL" ]; then
+        SYSCTL=`sysctl -n hw.ncpu`
+    fi
+
+    # sysctl -n hw.* does not work when invoked via B&I chroot /BuildRoot.
+    # Builders can default to 2, since even if they are single processor,
+    # nothing else is running on the machine.
+    if [ -z "$SYSCTL" ]; then
+        SYSCTL=2
+    fi
+
+    JOBS_FLAG="-j $SYSCTL"
+fi
+
+make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
+    LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
+    LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
     CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'"
 
 if ! test $? == 0 ; then
@@ -106,21 +137,6 @@ if ! test $? == 0 ; then
     exit 1
 fi 
 
-# Figure out how many make processes to run.
-SYSCTL=`sysctl -n hw.activecpu`
-
-# hw.activecpu only available in 10.2.6 and later
-if [ -z "$SYSCTL" ]; then
-  SYSCTL=`sysctl -n hw.ncpu`
-fi
-
-# sysctl -n hw.* does not work when invoked via B&I chroot /BuildRoot. Builders
-# can default to 2, since even if they are single processor, nothing else is
-# running on the machine.
-if [ -z "$SYSCTL" ]; then
-  SYSCTL=2
-fi
-
 ################################################################################
 # Construct the actual destination root, by copying stuff from $DIR/dst-* to
 # $DEST_DIR, with occasional 'lipo' commands.
@@ -141,29 +157,15 @@ if ! test $? == 0 ; then
 fi 
 
 # Install Version.h
-if [ "x$LLVM_SUBMIT_SUBVERSION" = "x00" -o "x$LLVM_SUBMIT_SUBVERSION" = "x0" ]; then
-    RC_ProjectSourceSubversion=0
-else
-    case "$LLVM_SUBMIT_SUBVERSION" in
-        01) RC_ProjectSourceSubversion=1 ;;
-        02) RC_ProjectSourceSubversion=2 ;;
-        03) RC_ProjectSourceSubversion=3 ;;
-        04) RC_ProjectSourceSubversion=4 ;;
-        05) RC_ProjectSourceSubversion=5 ;;
-        06) RC_ProjectSourceSubversion=6 ;;
-        07) RC_ProjectSourceSubversion=7 ;;
-        08) RC_ProjectSourceSubversion=8 ;;
-        09) RC_ProjectSourceSubversion=9 ;;
-        *)  RC_ProjectSourceSubversion=$LLVM_SUBMIT_SUBVERSION ;;
-    esac
-fi
-
+RC_ProjectSourceSubversion=`printf "%d" $LLVM_SUBMIT_SUBVERSION`
 echo "#define LLVM_VERSION ${RC_ProjectSourceVersion}" > $DEST_DIR$DEST_ROOT/include/llvm/Version.h
 echo "#define LLVM_MINOR_VERSION ${RC_ProjectSourceSubversion}" >> $DEST_DIR$DEST_ROOT/include/llvm/Version.h
 
-# Strip local symbols from llvm libraries.
-strip -S $DEST_DIR$DEST_ROOT/lib/*.[oa]
-strip -Sx $DEST_DIR$DEST_ROOT/lib/*.so
+if [ "x$LLVM_DEBUG" != "x1" ]; then
+    # Strip local symbols from llvm libraries.
+    strip -S $DEST_DIR$DEST_ROOT/lib/*.[oa]
+    strip -Sx $DEST_DIR$DEST_ROOT/lib/*.so
+fi
 
 # Remove .dir files 
 cd $DEST_DIR$DEST_ROOT
@@ -171,26 +173,45 @@ rm bin/.dir etc/llvm/.dir lib/.dir
 
 # Remove PPC64 fat slices.
 cd $DEST_DIR$DEST_ROOT/bin
-
 if [ $MACOSX_DEPLOYMENT_TARGET = "10.4" ]; then
     find . -perm 755 -type f -exec lipo -extract ppc -extract i386 {} -output {} \;
-else
+elif [ $MACOSX_DEPLOYMENT_TARGET = "10.5" ]; then
     find . -perm 755 -type f -exec lipo -extract ppc7400 -extract i386 {} -output {} \;
+else
+    find . -perm 755 -type f -exec lipo -extract ppc7400 -extract i386 -extract x86_64 {} -output {} \;
 fi
 
 cd $DEST_DIR$DEST_ROOT
-lipo -extract ppc -extract i386 lib/LLVMlto.0.0.0.so -output lib/LLVMlto.0.0.0.so
+mkdir -p $DT_HOME/lib
+mv lib/libLTO.dylib $DT_HOME/lib/libLTO.dylib
+rm -f lib/libLTO.a lib/libLTO.la
 
 ################################################################################
 # Create SYM_DIR with information required for debugging.
 
+# Figure out how many make processes to run.
+SYSCTL=`sysctl -n hw.activecpu`
+
+# hw.activecpu only available in 10.2.6 and later
+if [ -z "$SYSCTL" ]; then
+  SYSCTL=`sysctl -n hw.ncpu`
+fi
+
+# sysctl -n hw.* does not work when invoked via B&I chroot /BuildRoot. Builders
+# can default to 2, since even if they are single processor, nothing else is
+# running on the machine.
+if [ -z "$SYSCTL" ]; then
+  SYSCTL=2
+fi
+
 cd $SYM_DIR || exit 1
 
 # Clean out SYM_DIR in case -noclean was passed to buildit.
 rm -rf * || exit 1
 
 # Generate .dSYM files
-find $DEST_DIR -perm -0111 -type f -print | xargs -n 1 -P ${SYSCTL} dsymutil
+find $DEST_DIR -perm -0111 -type f ! \( -name '*.la' -o -name gccas -o -name gccld -o -name llvm-config \) -print \
+    | xargs -n 1 -P ${SYSCTL} dsymutil
 
 # Save .dSYM files and .a archives
 cd $DEST_DIR || exit 1
@@ -211,6 +232,11 @@ find $DEST_DIR -name \*.dSYM -print | xargs rm -r || exit 1
 chgrp -h -R wheel $DEST_DIR
 chgrp -R wheel $DEST_DIR
 
+################################################################################
+# Remove tar ball from docs directory
+
+find $DEST_DIR -name html.tar.gz -exec rm {} \;
+
 ################################################################################
 # w00t! Done!