MAKE=make
fi
-projects="llvm cfe compiler-rt libcxx libcxxabi test-suite clang-tools-extra"
-
# Base SVN URL for the sources.
Base_url="http://llvm.org/svn/llvm-project"
do_debug="no"
do_asserts="no"
do_compare="yes"
+do_rt="yes"
+do_libs="yes"
+do_libunwind="yes"
+do_test_suite="yes"
+do_openmp="no"
BuildDir="`pwd`"
use_autoconf="no"
ExtraConfigureFlags=""
+ExportBranch=""
function usage() {
echo "usage: `basename $0` -release X.Y.Z -rc NUM [OPTIONS]"
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"
+ echo " -no-rt Disable check-out & build Compiler-RT"
+ echo " -no-libs Disable check-out & build libcxx/libcxxabi/libunwind"
+ echo " -no-libunwind Disable check-out & build libunwind"
+ echo " -no-test-suite Disable check-out & build test-suite"
+ echo " -openmp Check out and build the OpenMP run-time (experimental)"
}
if [ `uname -s` = "Darwin" ]; then
-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"
-use-autoconf | --use-autoconf )
use_autoconf="yes"
;;
+ -no-rt )
+ do_rt="no"
+ ;;
+ -no-libs )
+ do_libs="no"
+ ;;
+ -no-libunwind )
+ do_libunwind="no"
+ ;;
+ -no-test-suite )
+ do_test_suite="no"
+ ;;
+ -openmp )
+ do_openmp="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
NumJobs=3
fi
+# Projects list
+projects="llvm cfe clang-tools-extra"
+if [ $do_rt = "yes" ]; then
+ projects="$projects compiler-rt"
+fi
+if [ $do_libs = "yes" ]; then
+ projects="$projects libcxx libcxxabi"
+ if [ $do_libunwind = "yes" ]; then
+ projects="$projects libunwind"
+ fi
+fi
+if [ $do_test_suite = "yes" ]; then
+ projects="$projects test-suite"
+fi
+if [ $do_openmp = "yes" ]; then
+ projects="$projects openmp"
+fi
+
# Go to the build directory (may be different from CWD)
BuildDir=$BuildDir/$RC
mkdir -p $BuildDir
fi
Package=$Package-$Triple
+# Errors to be highlighted at the end are written to this file.
+echo -n > $LogDir/deferred_errors.log
+
+function deferred_error() {
+ Phase="$1"
+ Flavor="$2"
+ Msg="$3"
+ echo "[${Flavor} Phase${Phase}] ${Msg}" | tee -a $LogDir/deferred_errors.log
+}
+
# Make sure that a required program is available
function check_program_exists() {
local program="$1"
for proj in $projects ; do
echo "# Validating $proj SVN URL"
- if ! svn ls $Base_url/$proj/tags/RELEASE_$Release_no_dot/$RC > /dev/null 2>&1 ; then
- echo "$proj $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
check_valid_urls
for proj in $projects ; do
+ if [ -d $proj.src ]; then
+ echo "# Reusing $proj $Release-$RC sources"
+ continue
+ fi
echo "# Exporting $proj $Release-$RC sources"
- if ! svn export -q $Base_url/$proj/tags/RELEASE_$Release_no_dot/$RC $proj.src ; then
+ if ! svn export -q $Base_url/$proj/$ExportBranch $proj.src ; then
echo "error: failed to export $proj project"
exit 1
fi
ln -s ../../cfe.src clang
fi
cd $BuildDir/llvm.src/tools/clang/tools
- if [ ! -h clang-tools-extra ]; then
+ if [ ! -h extra ]; then
ln -s ../../../../clang-tools-extra.src extra
fi
cd $BuildDir/llvm.src/projects
- if [ ! -h test-suite ]; then
+ if [ -d $BuildDir/test-suite.src ] && [ ! -h test-suite ]; then
ln -s ../../test-suite.src test-suite
fi
- if [ ! -h compiler-rt ]; then
+ if [ -d $BuildDir/compiler-rt.src ] && [ ! -h compiler-rt ]; then
ln -s ../../compiler-rt.src compiler-rt
fi
- if [ ! -h libcxx ]; then
+ if [ -d $BuildDir/libcxx.src ] && [ ! -h libcxx ]; then
ln -s ../../libcxx.src libcxx
fi
- if [ ! -h libcxxabi ]; then
+ if [ -d $BuildDir/libcxxabi.src ] && [ ! -h libcxxabi ]; then
ln -s ../../libcxxabi.src libcxxabi
fi
+ if [ -d $BuildDir/libunwind.src ] && [ ! -h libunwind ]; then
+ ln -s ../../libunwind.src libunwind
+ fi
+
cd $BuildDir
}
ObjDir="$3"
cd $ObjDir
- ${MAKE} -j $NumJobs -k check-all \
- 2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log
+ if ! ( ${MAKE} -j $NumJobs -k check-all \
+ 2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
+ deferred_error $Phase $Flavor "check-all failed"
+ fi
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
+ if ! ( ${MAKE} -k unittests 2>&1 | \
+ tee $LogDir/llvm.unittests-Phase$Phase-$Flavor.log ) ; then
+ deferred_error $Phase $Flavor "unittests failed"
+ fi
fi
cd $BuildDir
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
- rpath=`objdump -x $Candidate | grep '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
+ 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
function package_release() {
cwd=`pwd`
cd $BuildDir/Phase3/Release
- mv llvmCore-$Release-$RC.install $Package
+ 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
+ mv $Package llvmCore-$Release-$RC.install/usr/local
+ cd $cwd
+}
+
+# Build and package the OpenMP run-time. This is still experimental and not
+# meant for official testing in the release, but as a way for providing
+# binaries as a convenience to those who want to try it out.
+function build_OpenMP() {
+ cwd=`pwd`
+
+ rm -rf $BuildDir/Phase3/openmp
+ rm -rf $BuildDir/Phase3/openmp.install
+ mkdir -p $BuildDir/Phase3/openmp
+ cd $BuildDir/Phase3/openmp
+ clang=$BuildDir/Phase3/Release/llvmCore-$Release-$RC.install/usr/local/bin/clang
+
+ echo "#" cmake -DCMAKE_C_COMPILER=${clang} -DCMAKE_CXX_COMPILER=${clang}++ \
+ -DCMAKE_BUILD_TYPE=Release -DLIBOMP_MICRO_TESTS=on \
+ $BuildDir/openmp.src/runtime
+ cmake -DCMAKE_C_COMPILER=${clang} -DCMAKE_CXX_COMPILER=${clang}++ \
+ -DCMAKE_BUILD_TYPE=Release -DLIBOMP_MICRO_TESTS=on \
+ $BuildDir/openmp.src/runtime
+
+ echo "# Building OpenMP run-time"
+ echo "# ${MAKE} -j $NumJobs VERBOSE=1"
+ ${MAKE} -j $NumJobs VERBOSE=1
+ echo "# ${MAKE} libomp-micro-tests VERBOSE=1"
+ ${MAKE} libomp-micro-tests VERBOSE=1
+ echo "# ${MAKE} install DESTDIR=$BuildDir/Phase3/openmp.install"
+ ${MAKE} install DESTDIR=$BuildDir/Phase3/openmp.install
+
+ OpenMPPackage=OpenMP-$Release
+ if [ $RC != "final" ]; then
+ OpenMPPackage=$OpenMPPackage-$RC
+ fi
+ OpenMPPackage=$OpenMPPackage-$Triple
+
+ mv $BuildDir/Phase3/openmp.install/usr/local $BuildDir/$OpenMPPackage
+ cd $BuildDir
+ tar cvfJ $BuildDir/$OpenMPPackage.tar.xz $OpenMPPackage
+ mv $OpenMPPackage $BuildDir/Phase3/openmp.install/usr/local
cd $cwd
}
c_compiler="$CC"
cxx_compiler="$CXX"
-
llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.obj
llvmCore_phase1_destdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.install
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.
- if ! cmp --ignore-initial=16 <(sed -e 's,Phase2,Phase3,g' $p2) $p3 \
- > /dev/null 2>&1 ; then
+ # 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
done
+
+if [ $do_openmp = "yes" ]; then
+ build_OpenMP
+fi
+
) 2>&1 | tee $LogDir/testing.$Release-$RC.log
package_release
echo "### Package: $Package.tar.xz"
fi
echo "### Logs: $LogDir"
+
+echo "### Errors:"
+if [ -s "$LogDir/deferred_errors.log" ]; then
+ cat "$LogDir/deferred_errors.log"
+ exit 1
+else
+ echo "None."
+fi
+
exit 0
projects / oota-llvm.git / blobdiff