src - OpenBSD base system

diff options


context:
space:
mode:

author	Patrick Wildt <patrick@cvs.openbsd.org>	2017-01-24 08:33:39 +0000
committer	Patrick Wildt <patrick@cvs.openbsd.org>	2017-01-24 08:33:39 +0000
commit	191f5aec14fa2cfaf2f023580df9ac81db321223 (patch)
tree	54650dd8fc4a937b4efa5c479f29f9bd9f218975 /gnu/llvm/utils/release
parent	c5c5d71a3c51a145ba9d0a7d2f3ca2be4d6a2131 (diff)

Import LLVM 4.0.0 rc1 including clang and lld to help the current

development effort on OpenBSD/arm64.

Diffstat (limited to 'gnu/llvm/utils/release')

-rwxr-xr-x

gnu/llvm/utils/release/build_llvm_package.bat

-rwxr-xr-x

gnu/llvm/utils/release/merge.sh

-rwxr-xr-x

gnu/llvm/utils/release/test-release.sh

3 files changed, 27 insertions, 22 deletions

diff --git a/gnu/llvm/utils/release/build_llvm_package.bat b/gnu/llvm/utils/release/build_llvm_package.bat
index 5542ca613f3..e7895157cd0 100755
--- a/gnu/llvm/utils/release/build_llvm_package.bat
+++ b/gnu/llvm/utils/release/build_llvm_package.bat

@@ -8,19 +8,25 @@ REM Usage: build_llvm_package.bat <revision>

REM Prerequisites:

REM

-REM Visual Studio 2013, CMake, Ninja, SVN, GNUWin32,

+REM Visual Studio 2015, CMake, Ninja, SVN, GNUWin32, SWIG, Python 3,

REM NSIS with the strlen_8192 patch,

-REM Visual Studio 2013 SDK (for the clang-format plugin).

+REM Visual Studio 2015 SDK (for the clang-format plugin).

+REM

+REM For LLDB, SWIG version <= 3.0.8 needs to be used to work around

+REM https://github.com/swig/swig/issues/769

-REM You may need to modify the paths below:

-set vcdir=c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC

+REM You need to modify the paths below:

+set vcdir=c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC

+set python32_dir=C:\Users\hwennborg\AppData\Local\Programs\Python\Python35-32

+set python64_dir=C:\Users\hwennborg\AppData\Local\Programs\Python\Python35

set PATH=%PATH%;c:\gnuwin32\bin

set revision=%1

set branch=trunk

-set package_version=3.9.0-r%revision%

-set clang_format_vs_version=3.9.0.%revision%

+set package_version=4.0.0-r%revision%

+set clang_format_vs_version=4.0.0.%revision%

set build_dir=llvm_package_%revision%

echo Branch: %branch%

@@ -41,10 +47,11 @@ svn.exe export -r %revision% http://llvm.org/svn/llvm-project/clang-tools-extra/

svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lld/%branch% llvm/tools/lld || exit /b

svn.exe export -r %revision% http://llvm.org/svn/llvm-project/compiler-rt/%branch% llvm/projects/compiler-rt || exit /b

svn.exe export -r %revision% http://llvm.org/svn/llvm-project/openmp/%branch% llvm/projects/openmp || exit /b

+svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lldb/%branch% llvm/tools/lldb || exit /b

REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.

-set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DLLVM_USE_CRT_RELEASE=MT -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "

+set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DLLVM_USE_CRT_RELEASE=MT -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "

REM TODO: Run all tests, including lld and compiler-rt.

@@ -53,20 +60,20 @@ set CC=

set CXX=

mkdir build32_stage0

cd build32_stage0

-cmake -GNinja %cmake_flags% ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b

ninja all || exit /b

-ninja check || exit /b

-ninja check-clang || exit /b

+ninja check || ninja check || ninja check || exit /b

+ninja check-clang || ninja check-clang || ninja check-clang || exit /b

cd..

mkdir build32

cd build32

set CC=..\build32_stage0\bin\clang-cl

set CXX=..\build32_stage0\bin\clang-cl

-cmake -GNinja %cmake_flags% -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b

ninja all || exit /b

-ninja check || exit /b

-ninja check-clang || exit /b

+ninja check || ninja check || ninja check || exit /b

+ninja check-clang || ninja check-clang || ninja check-clang || exit /b

copy ..\llvm\tools\clang\tools\clang-format-vs\ClangFormat\bin\Release\ClangFormat.vsix ClangFormat-r%revision%.vsix

ninja package || exit /b

cd ..

@@ -77,19 +84,19 @@ set CC=

set CXX=

mkdir build64_stage0

cd build64_stage0

-cmake -GNinja %cmake_flags% ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b

ninja all || exit /b

-ninja check || exit /b

-ninja check-clang || exit /b

+ninja check || ninja check || ninja check || exit /b

+ninja check-clang || ninja check-clang || ninja check-clang || exit /b

cd..

mkdir build64

cd build64

set CC=..\build64_stage0\bin\clang-cl

set CXX=..\build64_stage0\bin\clang-cl

-cmake -GNinja %cmake_flags% ..\llvm || exit /b

+cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b

ninja all || exit /b

-ninja check || exit /b

-ninja check-clang || exit /b

+ninja check || ninja check || ninja check || exit /b

+ninja check-clang || ninja check-clang || ninja check-clang || exit /b

ninja package || exit /b

cd ..

diff --git a/gnu/llvm/utils/release/merge.sh b/gnu/llvm/utils/release/merge.sh
index b4893224834..698353d6915 100755
--- a/gnu/llvm/utils/release/merge.sh
+++ b/gnu/llvm/utils/release/merge.sh

@@ -95,7 +95,7 @@ else

echo

-echo "# To commit, run the following in $proj.src/:"

+echo "# To commit, run the following in $srcdir/:"

echo svn commit -F $tempfile

exit 0

diff --git a/gnu/llvm/utils/release/test-release.sh b/gnu/llvm/utils/release/test-release.sh
index b9cc38d35e2..73e31d46d51 100755
--- a/gnu/llvm/utils/release/test-release.sh
+++ b/gnu/llvm/utils/release/test-release.sh

@@ -355,13 +355,11 @@ function configure_llvmCore() {

echo "#" env CC="$c_compiler" CXX="$cxx_compiler" \

cmake -G "Unix Makefiles" \

-DCMAKE_BUILD_TYPE=$BuildType -DLLVM_ENABLE_ASSERTIONS=$Assertions \

- -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_CONFIGTIME="(timestamp not enabled)" \

$ExtraConfigureFlags $BuildDir/llvm.src \

2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log