MAKE=make
fi
-projects="llvm cfe dragonegg test-suite"
+projects="llvm cfe compiler-rt libcxx libcxxabi test-suite clang-tools-extra libunwind"
# Base SVN URL for the sources.
Base_url="http://llvm.org/svn/llvm-project"
Release=""
Release_no_dot=""
RC=""
+Triple=""
+use_gzip="no"
do_checkout="yes"
-do_ada="no"
-do_clang="yes"
-do_dragonegg="no"
-do_fortran="no"
-do_objc="yes"
-do_64bit="yes"
do_debug="no"
do_asserts="no"
+do_compare="yes"
BuildDir="`pwd`"
+use_autoconf="no"
+ExtraConfigureFlags=""
+ExportBranch=""
function usage() {
- echo "usage: `basename $0` -release X.Y -rc NUM [OPTIONS]"
+ echo "usage: `basename $0` -release X.Y.Z -rc NUM [OPTIONS]"
echo ""
- echo " -release X.Y The release number to test."
- echo " -rc NUM The pre-release candidate number."
- echo " -j NUM Number of compile jobs to run. [default: 3]"
- echo " -build-dir DIR Directory to perform testing in. [default: pwd]"
- echo " -no-checkout Don't checkout the sources from SVN."
- echo " -no-64bit Don't test the 64-bit version. [default: yes]"
- echo " -enable-ada Build Ada. [default: disable]"
- echo " -disable-clang Do not test clang. [default: enable]"
- echo " -enable-dragonegg Test dragonegg. [default: disable]"
- echo " -enable-fortran Enable Fortran build. [default: disable]"
- echo " -disable-objc Disable ObjC build. [default: enable]"
- echo " -test-debug Test the debug build. [default: no]"
- echo " -test-asserts Test with asserts on. [default: no]"
+ echo " -release X.Y.Z The release version to test."
+ echo " -rc NUM The pre-release candidate number."
+ echo " -final The final release candidate."
+ echo " -triple TRIPLE The target triple for this machine."
+ echo " -j NUM Number of compile jobs to run. [default: 3]"
+ echo " -build-dir DIR Directory to perform testing in. [default: pwd]"
+ echo " -no-checkout Don't checkout the sources from SVN."
+ echo " -test-debug Test the debug build. [default: no]"
+ echo " -test-asserts Test with asserts on. [default: no]"
+ echo " -no-compare-files Don't test that phase 2 and 3 files are identical."
+ echo " -use-gzip Use gzip instead of xz."
+ echo " -configure-flags FLAGS Extra flags to pass to the configure step."
+ echo " -use-autoconf Use autoconf instead of cmake"
+ echo " -svn-path DIR Use the specified DIR instead of a release."
+ echo " For example -svn-path trunk or -svn-path branches/release_37"
}
+if [ `uname -s` = "Darwin" ]; then
+ # compiler-rt doesn't yet build with CMake on Darwin.
+ use_autoconf="yes"
+fi
+
while [ $# -gt 0 ]; do
case $1 in
-release | --release )
shift
Release="$1"
- Release_no_dot="`echo $1 | sed -e 's,\.,,'`"
+ Release_no_dot="`echo $1 | sed -e 's,\.,,g'`"
;;
-rc | --rc | -RC | --RC )
shift
- RC=$1
+ RC="rc$1"
+ ;;
+ -final | --final )
+ RC=final
+ ;;
+ -svn-path | --svn-path )
+ shift
+ Release="test"
+ Release_no_dot="test"
+ ExportBranch="$1"
+ RC="`echo $ExportBranch | sed -e 's,/,_,g'`"
+ echo "WARNING: Using the branch $ExportBranch instead of a release tag"
+ echo " This is intended to aid new packagers in trialing "
+ echo " builds without requiring a tag to be created first"
+ ;;
+ -triple | --triple )
+ shift
+ Triple="$1"
+ ;;
+ -configure-flags | --configure-flags )
+ shift
+ ExtraConfigureFlags="$1"
;;
-j* )
NumJobs="`echo $1 | sed -e 's,-j\([0-9]*\),\1,g'`"
-no-checkout | --no-checkout )
do_checkout="no"
;;
- -no-64bit | --no-64bit )
- do_64bit="no"
- ;;
- -enable-ada | --enable-ada )
- do_ada="yes"
- ;;
- -disable-clang | --disable-clang )
- do_clang="no"
- ;;
- -enable-dragonegg | --enable-dragonegg )
- do_dragonegg="yes"
- ;;
- -enable-fortran | --enable-fortran )
- do_fortran="yes"
- ;;
- -disable-objc | --disable-objc )
- do_objc="no"
- ;;
-test-debug | --test-debug )
do_debug="yes"
;;
-test-asserts | --test-asserts )
do_asserts="yes"
;;
+ -no-compare-files | --no-compare-files )
+ do_compare="no"
+ ;;
+ -use-gzip | --use-gzip )
+ use_gzip="yes"
+ ;;
+ -use-autoconf | --use-autoconf )
+ use_autoconf="yes"
+ ;;
-help | --help | -h | --h | -\? )
usage
exit 0
echo "error: no release candidate number specified"
exit 1
fi
+if [ -z "$ExportBranch" ]; then
+ ExportBranch="tags/RELEASE_$Release_no_dot/$RC"
+fi
+if [ -z "$Triple" ]; then
+ echo "error: no target triple specified"
+ exit 1
+fi
# Figure out how many make processes to run.
if [ -z "$NumJobs" ]; then
fi
# Go to the build directory (may be different from CWD)
-BuildDir=$BuildDir/rc$RC
+BuildDir=$BuildDir/$RC
mkdir -p $BuildDir
cd $BuildDir
LogDir=$BuildDir/logs
mkdir -p $LogDir
-# Find compilers.
-if [ "$do_dragonegg" = "yes" ]; then
- gcc_compiler="$GCC"
- if [ -z "$gcc_compiler" ]; then
- gcc_compiler="`which gcc`"
- if [ -z "$gcc_compiler" ]; then
- echo "error: cannot find gcc to use with dragonegg"
- exit 1
- fi
- fi
-
- gxx_compiler="$GXX"
- if [ -z "$gxx_compiler" ]; then
- gxx_compiler="`which g++`"
- if [ -z "$gxx_compiler" ]; then
- echo "error: cannot find g++ to use with dragonegg"
- exit 1
- fi
- fi
+# Final package name.
+Package=clang+llvm-$Release
+if [ $RC != "final" ]; then
+ Package=$Package-$RC
fi
+Package=$Package-$Triple
+
+# Make sure that a required program is available
+function check_program_exists() {
+ local program="$1"
+ if ! type -P $program > /dev/null 2>&1 ; then
+ echo "program '$1' not found !"
+ exit 1
+ fi
+}
+if [ `uname -s` != "Darwin" ]; then
+ check_program_exists 'chrpath'
+ check_program_exists 'file'
+ check_program_exists 'objdump'
+fi
# Make sure that the URLs are valid.
function check_valid_urls() {
for proj in $projects ; do
echo "# Validating $proj SVN URL"
- if ! svn ls $Base_url/$proj/tags/RELEASE_$Release_no_dot/rc$RC > /dev/null 2>&1 ; then
- echo "llvm $Release release candidate $RC doesn't exist!"
+ if ! svn ls $Base_url/$proj/$ExportBranch > /dev/null 2>&1 ; then
+ echo "$proj does not have a $ExportBranch branch/tag!"
exit 1
fi
done
}
-# Export sources to the the build directory.
+# Export sources to the build directory.
function export_sources() {
check_valid_urls
for proj in $projects ; do
- echo "# Exporting $proj $Release-RC$RC sources"
- if ! svn export -q $Base_url/$proj/tags/RELEASE_$Release_no_dot/rc$RC $proj.src ; then
+ echo "# Exporting $proj $Release-$RC sources"
+ if ! svn export -q $Base_url/$proj/$ExportBranch $proj.src ; then
echo "error: failed to export $proj project"
exit 1
fi
echo "# Creating symlinks"
cd $BuildDir/llvm.src/tools
if [ ! -h clang ]; then
- ln -s $BuildDir/cfe.src clang
+ ln -s ../../cfe.src clang
+ fi
+ cd $BuildDir/llvm.src/tools/clang/tools
+ if [ ! -h clang-tools-extra ]; then
+ ln -s ../../../../clang-tools-extra.src extra
fi
cd $BuildDir/llvm.src/projects
- if [ ! -h llvm-test ]; then
- ln -s $BuildDir/test-suite.src llvm-test
+ if [ ! -h test-suite ]; then
+ ln -s ../../test-suite.src test-suite
+ fi
+ if [ ! -h compiler-rt ]; then
+ ln -s ../../compiler-rt.src compiler-rt
+ fi
+ if [ ! -h libcxx ]; then
+ ln -s ../../libcxx.src libcxx
fi
+ if [ ! -h libcxxabi ]; then
+ ln -s ../../libcxxabi.src libcxxabi
+ fi
+ if [ ! -h libunwind ]; then
+ ln -s ../../libunwind.src libunwind
+ fi
+
cd $BuildDir
}
Phase="$1"
Flavor="$2"
ObjDir="$3"
- InstallDir="$4"
case $Flavor in
- Release | Release-64 )
- Optimized="yes"
- Assertions="no"
+ Release )
+ BuildType="Release"
+ Assertions="OFF"
+ ConfigureFlags="--enable-optimized --disable-assertions"
;;
Release+Asserts )
- Optimized="yes"
- Assertions="yes"
+ BuildType="Release"
+ Assertions="ON"
+ ConfigureFlags="--enable-optimized --enable-assertions"
;;
Debug )
- Optimized="no"
- Assertions="yes"
+ BuildType="Debug"
+ Assertions="ON"
+ ConfigureFlags="--disable-optimized --enable-assertions"
;;
* )
echo "# Invalid flavor '$Flavor'"
echo "# Using C++ compiler: $cxx_compiler"
cd $ObjDir
- echo "# Configuring llvm $Release-rc$RC $Flavor"
- echo "# $BuildDir/llvm.src/configure --prefix=$InstallDir \
- --enable-optimized=$Optimized \
- --enable-assertions=$Assertions"
- env CC="$c_compiler" CXX="$cxx_compiler" \
- $BuildDir/llvm.src/configure --prefix=$InstallDir \
- --enable-optimized=$Optimized \
- --enable-assertions=$Assertions \
- 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+ echo "# Configuring llvm $Release-$RC $Flavor"
+
+ if [ "$use_autoconf" = "yes" ]; then
+ echo "#" env CC="$c_compiler" CXX="$cxx_compiler" \
+ $BuildDir/llvm.src/configure \
+ $ConfigureFlags --disable-timestamps $ExtraConfigureFlags \
+ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+ env CC="$c_compiler" CXX="$cxx_compiler" \
+ $BuildDir/llvm.src/configure \
+ $ConfigureFlags --disable-timestamps $ExtraConfigureFlags \
+ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+ else
+ echo "#" env CC="$c_compiler" CXX="$cxx_compiler" \
+ cmake -G "Unix Makefiles" \
+ -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
+ -DLLVM_ENABLE_TIMESTAMPS=OFF -DLLVM_CONFIGTIME="(timestamp not enabled)" \
+ $ExtraConfigureFlags $BuildDir/llvm.src \
+ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+ env CC="$c_compiler" CXX="$cxx_compiler" \
+ cmake -G "Unix Makefiles" \
+ -DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \
+ -DLLVM_ENABLE_TIMESTAMPS=OFF -DLLVM_CONFIGTIME="(timestamp not enabled)" \
+ $ExtraConfigureFlags $BuildDir/llvm.src \
+ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log
+ fi
+
cd $BuildDir
}
Phase="$1"
Flavor="$2"
ObjDir="$3"
- ExtraOpts=""
-
- if [ "$Flavor" = "Release-64" ]; then
- ExtraOpts="EXTRA_OPTIONS=-m64"
- fi
+ DestDir="$4"
cd $ObjDir
- echo "# Compiling llvm $Release-rc$RC $Flavor"
- echo "# ${MAKE} -j $NumJobs VERBOSE=1 $ExtraOpts"
- ${MAKE} -j $NumJobs VERBOSE=1 $ExtraOpts \
+ echo "# Compiling llvm $Release-$RC $Flavor"
+ echo "# ${MAKE} -j $NumJobs VERBOSE=1"
+ ${MAKE} -j $NumJobs VERBOSE=1 \
2>&1 | tee $LogDir/llvm.make-Phase$Phase-$Flavor.log
- echo "# Installing llvm $Release-rc$RC $Flavor"
+ echo "# Installing llvm $Release-$RC $Flavor"
echo "# ${MAKE} install"
${MAKE} install \
+ DESTDIR="${DestDir}" \
2>&1 | tee $LogDir/llvm.install-Phase$Phase-$Flavor.log
cd $BuildDir
}
-function build_dragonegg() {
- Phase="$1"
- Flavor="$2"
- LLVMInstallDir="$3"
- DragonEggObjDir="$4"
- LLVM_CONFIG=$LLVMInstallDir/bin/llvm-config
- TOP_DIR=$BuildDir/dragonegg.src
-
- echo "# Targeted compiler: $gcc_compiler"
-
- cd $DragonEggObjDir
- echo "# Compiling phase $Phase dragonegg $Release-rc$RC $Flavor"
- echo -n "# CXX=$cxx_compiler TOP_DIR=$TOP_DIR GCC=$gcc_compiler "
- echo -n "LLVM_CONFIG=$LLVM_CONFIG ${MAKE} -f $TOP_DIR/Makefile "
- echo "-j $NumJobs VERBOSE=1"
- CXX="$cxx_compiler" TOP_DIR="$TOP_DIR" GCC="$gcc_compiler" \
- LLVM_CONFIG="$LLVM_CONFIG" ${MAKE} -f $TOP_DIR/Makefile \
- -j $NumJobs VERBOSE=1 \
- 2>&1 | tee $LogDir/dragonegg-Phase$Phase-$Flavor.log
- cd $BuildDir
-}
-
function test_llvmCore() {
Phase="$1"
Flavor="$2"
ObjDir="$3"
cd $ObjDir
- ${MAKE} -k check-all \
+ ${MAKE} -j $NumJobs -k check-all \
2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log
- ${MAKE} -k unittests \
- 2>&1 | tee $LogDir/llvm.unittests-Phase$Phase-$Flavor.log
+
+ if [ "$use_autoconf" = "yes" ]; then
+ # In the cmake build, unit tests are run as part of check-all.
+ ${MAKE} -k unittests \
+ 2>&1 | tee $LogDir/llvm.unittests-Phase$Phase-$Flavor.log
+ fi
+
cd $BuildDir
}
-set -e # Exit if any command fails
+# Clean RPATH. Libtool adds the build directory to the search path, which is
+# not necessary --- and even harmful --- for the binary packages we release.
+function clean_RPATH() {
+ if [ `uname -s` = "Darwin" ]; then
+ return
+ fi
+ local InstallPath="$1"
+ for Candidate in `find $InstallPath/{bin,lib} -type f`; do
+ if file $Candidate | grep ELF | egrep 'executable|shared object' > /dev/null 2>&1 ; then
+ if rpath=`objdump -x $Candidate | grep 'RPATH'` ; then
+ rpath=`echo $rpath | sed -e's/^ *RPATH *//'`
+ if [ -n "$rpath" ]; then
+ newrpath=`echo $rpath | sed -e's/.*\(\$ORIGIN[^:]*\).*/\1/'`
+ chrpath -r $newrpath $Candidate 2>&1 > /dev/null 2>&1
+ fi
+ fi
+ fi
+ done
+}
+
+# Create a package of the release binaries.
+function package_release() {
+ cwd=`pwd`
+ cd $BuildDir/Phase3/Release
+ mv llvmCore-$Release-$RC.install/usr/local $Package
+ if [ "$use_gzip" = "yes" ]; then
+ tar cfz $BuildDir/$Package.tar.gz $Package
+ else
+ tar cfJ $BuildDir/$Package.tar.xz $Package
+ fi
+ mv $Package llvmCore-$Release-$RC.install/usr/local
+ cd $cwd
+}
+
+# Exit if any command fails
+# Note: pipefail is necessary for running build commands through
+# a pipe (i.e. it changes the output of ``false | tee /dev/null ; echo $?``)
+set -e
+set -o pipefail
if [ "$do_checkout" = "yes" ]; then
export_sources
if [ "$do_asserts" = "yes" ]; then
Flavors="$Flavors Release+Asserts"
fi
-if [ "$do_64bit" = "yes" ]; then
- Flavors="$Flavors Release-64"
-fi
for Flavor in $Flavors ; do
echo ""
echo ""
echo "********************************************************************************"
- echo " Release: $Release-rc$RC"
+ echo " Release: $Release-$RC"
echo " Build: $Flavor"
echo " System Info: "
echo " `uname -a`"
c_compiler="$CC"
cxx_compiler="$CXX"
- llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-rc$RC.obj
- llvmCore_phase1_installdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-rc$RC.install
- dragonegg_phase1_objdir=$BuildDir/Phase1/$Flavor/DragonEgg-$Release-rc$RC.obj
+ llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.obj
+ llvmCore_phase1_destdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.install
- llvmCore_phase2_objdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-rc$RC.obj
- llvmCore_phase2_installdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-rc$RC.install
- llvmCore_de_phase2_objdir=$BuildDir/Phase2/$Flavor/llvmCore-DragonEgg-$Release-rc$RC.obj
- llvmCore_de_phase2_installdir=$BuildDir/Phase2/$Flavor/llvmCore-DragonEgg-$Release-rc$RC.install
- dragonegg_phase2_objdir=$BuildDir/Phase2/$Flavor/DragonEgg-$Release-rc$RC.obj
+ llvmCore_phase2_objdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-$RC.obj
+ llvmCore_phase2_destdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-$RC.install
- llvmCore_phase3_objdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-rc$RC.obj
- llvmCore_phase3_installdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-rc$RC.install
- llvmCore_de_phase3_objdir=$BuildDir/Phase3/$Flavor/llvmCore-DragonEgg-$Release-rc$RC.obj
- llvmCore_de_phase3_installdir=$BuildDir/Phase3/$Flavor/llvmCore-DragonEgg-$Release-rc$RC.install
- dragonegg_phase3_objdir=$BuildDir/Phase3/$Flavor/DragonEgg-$Release-rc$RC.obj
+ llvmCore_phase3_objdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-$RC.obj
+ llvmCore_phase3_destdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-$RC.install
rm -rf $llvmCore_phase1_objdir
- rm -rf $llvmCore_phase1_installdir
- rm -rf $dragonegg_phase1_objdir
+ rm -rf $llvmCore_phase1_destdir
rm -rf $llvmCore_phase2_objdir
- rm -rf $llvmCore_phase2_installdir
- rm -rf $llvmCore_de_phase2_objdir
- rm -rf $llvmCore_de_phase2_installdir
- rm -rf $dragonegg_phase2_objdir
+ rm -rf $llvmCore_phase2_destdir
rm -rf $llvmCore_phase3_objdir
- rm -rf $llvmCore_phase3_installdir
- rm -rf $llvmCore_de_phase3_objdir
- rm -rf $llvmCore_de_phase3_installdir
- rm -rf $dragonegg_phase3_objdir
+ rm -rf $llvmCore_phase3_destdir
mkdir -p $llvmCore_phase1_objdir
- mkdir -p $llvmCore_phase1_installdir
- mkdir -p $dragonegg_phase1_objdir
+ mkdir -p $llvmCore_phase1_destdir
mkdir -p $llvmCore_phase2_objdir
- mkdir -p $llvmCore_phase2_installdir
- mkdir -p $llvmCore_de_phase2_objdir
- mkdir -p $llvmCore_de_phase2_installdir
- mkdir -p $dragonegg_phase2_objdir
+ mkdir -p $llvmCore_phase2_destdir
mkdir -p $llvmCore_phase3_objdir
- mkdir -p $llvmCore_phase3_installdir
- mkdir -p $llvmCore_de_phase3_objdir
- mkdir -p $llvmCore_de_phase3_installdir
- mkdir -p $dragonegg_phase3_objdir
+ mkdir -p $llvmCore_phase3_destdir
############################################################################
# Phase 1: Build llvmCore and clang
echo "# Phase 1: Building llvmCore"
- configure_llvmCore 1 $Flavor \
- $llvmCore_phase1_objdir $llvmCore_phase1_installdir
+ configure_llvmCore 1 $Flavor $llvmCore_phase1_objdir
build_llvmCore 1 $Flavor \
- $llvmCore_phase1_objdir
-
- # Test clang
- if [ "$do_clang" = "yes" ]; then
- ############################################################################
- # Phase 2: Build llvmCore with newly built clang from phase 1.
- c_compiler=$llvmCore_phase1_installdir/bin/clang
- cxx_compiler=$llvmCore_phase1_installdir/bin/clang++
- echo "# Phase 2: Building llvmCore"
- configure_llvmCore 2 $Flavor \
- $llvmCore_phase2_objdir $llvmCore_phase2_installdir
- build_llvmCore 2 $Flavor \
- $llvmCore_phase2_objdir
-
- ############################################################################
- # Phase 3: Build llvmCore with newly built clang from phase 2.
- c_compiler=$llvmCore_phase2_installdir/bin/clang
- cxx_compiler=$llvmCore_phase2_installdir/bin/clang++
- echo "# Phase 3: Building llvmCore"
- configure_llvmCore 3 $Flavor \
- $llvmCore_phase3_objdir $llvmCore_phase3_installdir
- build_llvmCore 3 $Flavor \
- $llvmCore_phase3_objdir
-
- ############################################################################
- # Testing: Test phase 3
- echo "# Testing - built with clang"
- test_llvmCore 3 $Flavor $llvmCore_phase3_objdir
-
- ############################################################################
- # Compare .o files between Phase2 and Phase3 and report which ones differ.
+ $llvmCore_phase1_objdir $llvmCore_phase1_destdir
+ clean_RPATH $llvmCore_phase1_destdir/usr/local
+
+ ########################################################################
+ # Phase 2: Build llvmCore with newly built clang from phase 1.
+ c_compiler=$llvmCore_phase1_destdir/usr/local/bin/clang
+ cxx_compiler=$llvmCore_phase1_destdir/usr/local/bin/clang++
+ echo "# Phase 2: Building llvmCore"
+ configure_llvmCore 2 $Flavor $llvmCore_phase2_objdir
+ build_llvmCore 2 $Flavor \
+ $llvmCore_phase2_objdir $llvmCore_phase2_destdir
+ clean_RPATH $llvmCore_phase2_destdir/usr/local
+
+ ########################################################################
+ # Phase 3: Build llvmCore with newly built clang from phase 2.
+ c_compiler=$llvmCore_phase2_destdir/usr/local/bin/clang
+ cxx_compiler=$llvmCore_phase2_destdir/usr/local/bin/clang++
+ echo "# Phase 3: Building llvmCore"
+ configure_llvmCore 3 $Flavor $llvmCore_phase3_objdir
+ build_llvmCore 3 $Flavor \
+ $llvmCore_phase3_objdir $llvmCore_phase3_destdir
+ clean_RPATH $llvmCore_phase3_destdir/usr/local
+
+ ########################################################################
+ # Testing: Test phase 3
+ echo "# Testing - built with clang"
+ test_llvmCore 3 $Flavor $llvmCore_phase3_objdir
+
+ ########################################################################
+ # Compare .o files between Phase2 and Phase3 and report which ones
+ # differ.
+ if [ "$do_compare" = "yes" ]; then
echo
echo "# Comparing Phase 2 and Phase 3 files"
- for o in `find $llvmCore_phase2_objdir -name '*.o'` ; do
- p3=`echo $o | sed -e 's,Phase2,Phase3,'`
- if ! cmp --ignore-initial=16 $o $p3 > /dev/null 2>&1 ; then
- echo "file `basename $o` differs between phase 2 and phase 3"
+ for p2 in `find $llvmCore_phase2_objdir -name '*.o'` ; do
+ p3=`echo $p2 | sed -e 's,Phase2,Phase3,'`
+ # Substitute 'Phase2' for 'Phase3' in the Phase 2 object file in
+ # case there are build paths in the debug info. On some systems,
+ # sed adds a newline to the output, so pass $p3 through sed too.
+ if ! cmp -s <(sed -e 's,Phase2,Phase3,g' $p2) <(sed -e '' $p3) \
+ 16 16 ; then
+ echo "file `basename $p2` differs between phase 2 and phase 3"
fi
done
fi
-
- # Test dragonegg
- if [ "$do_dragonegg" = "yes" ]; then
- # Build dragonegg using the targeted gcc. This isn't necessary, but
- # helps avoid using broken versions of gcc (which are legion), tests
- # that the targeted gcc is basically sane and is consistent with the
- # later phases in which the targeted gcc + dragonegg are used.
- c_compiler="$gcc_compiler"
- cxx_compiler="$gxx_compiler"
- build_dragonegg 1 $Flavor $llvmCore_phase1_installdir $dragonegg_phase1_objdir
-
- ############################################################################
- # Phase 2: Build llvmCore with newly built dragonegg from phase 1.
- c_compiler="$gcc_compiler -fplugin=$dragonegg_phase1_objdir/dragonegg.so"
- cxx_compiler="$gxx_compiler -fplugin=$dragonegg_phase1_objdir/dragonegg.so"
- echo "# Phase 2: Building llvmCore with dragonegg"
- configure_llvmCore 2 $Flavor \
- $llvmCore_de_phase2_objdir $llvmCore_de_phase2_installdir
- build_llvmCore 2 $Flavor \
- $llvmCore_de_phase2_objdir
- build_dragonegg 2 $Flavor $llvmCore_de_phase2_installdir $dragonegg_phase2_objdir
-
- ############################################################################
- # Phase 3: Build llvmCore with newly built clang from phase 2.
- c_compiler="$gcc_compiler -fplugin=$dragonegg_phase2_objdir/dragonegg.so"
- cxx_compiler="$gxx_compiler -fplugin=$dragonegg_phase2_objdir/dragonegg.so"
- echo "# Phase 3: Building llvmCore with dragonegg"
- configure_llvmCore 3 $Flavor \
- $llvmCore_de_phase3_objdir $llvmCore_de_phase3_installdir
- build_llvmCore 3 $Flavor \
- $llvmCore_de_phase3_objdir
- build_dragonegg 3 $Flavor $llvmCore_de_phase3_installdir $dragonegg_phase3_objdir
-
- ############################################################################
- # Testing: Test phase 3
- c_compiler="$gcc_compiler -fplugin=$dragonegg_phase3_objdir/dragonegg.so"
- cxx_compiler="$gxx_compiler -fplugin=$dragonegg_phase3_objdir/dragonegg.so"
- echo "# Testing - built with dragonegg"
- test_llvmCore 3 $Flavor $llvmCore_de_phase3_objdir
-
- ############################################################################
- # Compare .o files between Phase2 and Phase3 and report which ones differ.
- echo
- echo "# Comparing Phase 2 and Phase 3 files"
- for o in `find $llvmCore_de_phase2_objdir -name '*.o'` ; do
- p3=`echo $o | sed -e 's,Phase2,Phase3,'`
- if ! cmp --ignore-initial=16 $o $p3 > /dev/null 2>&1 ; then
- echo "file `basename $o` differs between dragonegg phase 2 and phase 3"
- fi
- done
- fi
-
- # Otherwise just test the core.
- if [ "$do_clang" != "yes" -a "$do_dragonegg" != "yes" ]; then
- echo "# Testing - built with system compiler"
- test_llvmCore 1 $Flavor $llvmCore_phase1_objdir
- fi
done
-) 2>&1 | tee $LogDir/testing.$Release-rc$RC.log
+) 2>&1 | tee $LogDir/testing.$Release-$RC.log
+
+package_release
set +e
# Woo hoo!
echo "### Testing Finished ###"
+if [ "$use_gzip" = "yes" ]; then
+ echo "### Package: $Package.tar.gz"
+else
+ echo "### Package: $Package.tar.xz"
+fi
echo "### Logs: $LogDir"
exit 0
projects / oota-llvm.git / blobdiff