authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-19 17:34:52-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-19 17:34:52-04:00
loga4d61b5d72750a11d8294986939b433070f3d1ff
tree90e75c76003f9beb17c3d0b91095af508687cff4
parentf9bf04c38b693b0eee368416ec8eaba06a057e1e

update to llvm 8

11 files changed, 27 insertions(+), 26 deletions(-)

README.md+6-6
...@@ -87,14 +87,14 @@ that counts as "freestanding" for the purposes of this table....@@ -87,14 +87,14 @@ that counts as "freestanding" for the purposes of this table.
8787
88 * cmake >= 2.8.588 * cmake >= 2.8.5
89 * gcc >= 5.0.0 or clang >= 3.6.089 * gcc >= 5.0.0 or clang >= 3.6.0
90 * LLVM, Clang, LLD development libraries == 7.x, compiled with the same gcc or clang version above90 * LLVM, Clang, LLD development libraries == 8.x, compiled with the same gcc or clang version above
91 - These depend on zlib and libxml2.91 - These depend on zlib and libxml2.
9292
93##### Windows93##### Windows
9494
95 * cmake >= 2.8.595 * cmake >= 2.8.5
96 * Microsoft Visual Studio 201596 * Microsoft Visual Studio 2017 (version 15.8)
97 * LLVM, Clang, LLD development libraries == 7.x, compiled with the same MSVC version above97 * LLVM, Clang, LLD development libraries == 8.x, compiled with the same MSVC version above
9898
99#### Instructions99#### Instructions
100100
...@@ -112,11 +112,11 @@ bin/zig build --build-file ../build.zig test...@@ -112,11 +112,11 @@ bin/zig build --build-file ../build.zig test
112##### MacOS112##### MacOS
113113
114```114```
115brew install cmake llvm@7115brew install cmake llvm@8
116brew outdated llvm@7 || brew upgrade llvm@7116brew outdated llvm@8 || brew upgrade llvm@8
117mkdir build117mkdir build
118cd build118cd build
119cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/119cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@8/
120make install120make install
121bin/zig build --build-file ../build.zig test121bin/zig build --build-file ../build.zig test
122```122```
ci/appveyor/appveyor.yml+1
...@@ -7,3 +7,4 @@ after_build:...@@ -7,3 +7,4 @@ after_build:
7 - '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat'7 - '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat'
8cache:8cache:
9 - 'llvm+clang-7.0.0-win64-msvc-release.tar.xz'9 - 'llvm+clang-7.0.0-win64-msvc-release.tar.xz'
10 - 'llvm+clang-8.0.0-win64-msvc-release.tar.xz'
ci/appveyor/build_script.bat+2-2
...@@ -7,13 +7,13 @@ SET "PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%"...@@ -7,13 +7,13 @@ SET "PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%"
7SET "MSYSTEM=MINGW64"7SET "MSYSTEM=MINGW64"
8SET "APPVEYOR_CACHE_ENTRY_ZIP_ARGS=-m0=Copy"8SET "APPVEYOR_CACHE_ENTRY_ZIP_ARGS=-m0=Copy"
99
10bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && if [ -s ""llvm+clang-7.0.0-win64-msvc-release.tar.xz"" ]; then echo 'skipping LLVM download'; else wget 'https://s3.amazonaws.com/ziglang.org/deps/llvm%%2bclang-7.0.0-win64-msvc-release.tar.xz'; fi && tar xf llvm+clang-7.0.0-win64-msvc-release.tar.xz" || exit /b10bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && if [ -s ""llvm+clang-8.0.0-win64-msvc-release.tar.xz"" ]; then echo 'skipping LLVM download'; else wget 'https://s3.amazonaws.com/ziglang.org/deps/llvm%%2bclang-8.0.0-win64-msvc-release.tar.xz'; fi && tar xf llvm+clang-8.0.0-win64-msvc-release.tar.xz" || exit /b
1111
1212
13SET "PATH=%PREVPATH%"13SET "PATH=%PREVPATH%"
14SET "MSYSTEM=%PREVMSYSTEM%"14SET "MSYSTEM=%PREVMSYSTEM%"
15SET "ZIGBUILDDIR=%APPVEYOR_BUILD_FOLDER%\build-msvc-release"15SET "ZIGBUILDDIR=%APPVEYOR_BUILD_FOLDER%\build-msvc-release"
16SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-7.0.0-win64-msvc-release"16SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-8.0.0-win64-msvc-release"
1717
18call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x6418call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
19call "C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" x86_amd6419call "C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" x86_amd64
ci/travis_linux_before_install+1-1
...@@ -2,7 +2,7 @@...@@ -2,7 +2,7 @@
22
3set -x3set -x
44
5sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main" >> /etc/apt/sources.list'5sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-8 main" >> /etc/apt/sources.list'
6wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -6wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
7sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test7sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
8sudo apt-get update -q8sudo apt-get update -q
ci/travis_linux_install+1-1
...@@ -4,4 +4,4 @@ set -x...@@ -4,4 +4,4 @@ set -x
44
5sudo apt-get remove -y llvm-*5sudo apt-get remove -y llvm-*
6sudo rm -rf /usr/local/*6sudo rm -rf /usr/local/*
7sudo apt-get install -y libxml2-dev libclang-7-dev llvm-7 llvm-7-dev cmake s3cmd gcc-7 g++-77sudo apt-get install -y libxml2-dev libclang-8-dev llvm-8 llvm-8-dev cmake s3cmd gcc-7 g++-7
ci/travis_linux_script+1-1
...@@ -14,7 +14,7 @@ make -j2 install...@@ -14,7 +14,7 @@ make -j2 install
1414
15if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then15if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
16 mkdir $TRAVIS_BUILD_DIR/artifacts16 mkdir $TRAVIS_BUILD_DIR/artifacts
17 docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm7-1 -j2 $TRAVIS_COMMIT17 docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm8-1 -j2 $TRAVIS_COMMIT
18 echo "access_key = $AWS_ACCESS_KEY_ID" >> ~/.s3cfg18 echo "access_key = $AWS_ACCESS_KEY_ID" >> ~/.s3cfg
19 echo "secret_key = $AWS_SECRET_ACCESS_KEY" >> ~/.s3cfg19 echo "secret_key = $AWS_SECRET_ACCESS_KEY" >> ~/.s3cfg
20 s3cmd put -P $TRAVIS_BUILD_DIR/artifacts/* s3://ziglang.org/builds/20 s3cmd put -P $TRAVIS_BUILD_DIR/artifacts/* s3://ziglang.org/builds/
ci/travis_osx_install+2-2
...@@ -2,6 +2,6 @@...@@ -2,6 +2,6 @@
22
3set -x3set -x
44
5brew install llvm@75brew install llvm@8
6brew outdated llvm@7 || brew upgrade llvm@76brew outdated llvm@8 || brew upgrade llvm@8
77
ci/travis_osx_script+1-1
...@@ -5,7 +5,7 @@ set -e...@@ -5,7 +5,7 @@ set -e
55
6mkdir build6mkdir build
7cd build7cd build
8cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/ -DCMAKE_BUILD_TYPE=Release8cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@8/ -DCMAKE_BUILD_TYPE=Release
9make VERBOSE=19make VERBOSE=1
10make install10make install
1111
cmake/Findclang.cmake+6-6
...@@ -27,9 +27,9 @@ if(MSVC)...@@ -27,9 +27,9 @@ if(MSVC)
27else()27else()
28 find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h28 find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
29 PATHS29 PATHS
30 /usr/lib/llvm/7/include30 /usr/lib/llvm/8/include
31 /usr/lib/llvm-7/include31 /usr/lib/llvm-8/include
32 /usr/lib/llvm-7.0/include32 /usr/lib/llvm-8.0/include
33 /mingw64/include)33 /mingw64/include)
3434
35 macro(FIND_AND_ADD_CLANG_LIB _libname_)35 macro(FIND_AND_ADD_CLANG_LIB _libname_)
...@@ -37,9 +37,9 @@ else()...@@ -37,9 +37,9 @@ else()
37 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}37 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
38 PATHS38 PATHS
39 ${CLANG_LIBDIRS}39 ${CLANG_LIBDIRS}
40 /usr/lib/llvm/7/lib40 /usr/lib/llvm/8/lib
41 /usr/lib/llvm-7/lib41 /usr/lib/llvm-8/lib
42 /usr/lib/llvm-7.0/lib42 /usr/lib/llvm-8.0/lib
43 /mingw64/lib43 /mingw64/lib
44 /c/msys64/mingw64/lib44 /c/msys64/mingw64/lib
45 c:\\msys64\\mingw64\\lib)45 c:\\msys64\\mingw64\\lib)
cmake/Findlld.cmake+3-3
...@@ -8,10 +8,10 @@...@@ -8,10 +8,10 @@
88
9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10 PATHS10 PATHS
11 /usr/lib/llvm-6.0/include11 /usr/lib/llvm-8.0/include
12 /mingw64/include)12 /mingw64/include)
1313
14find_library(LLD_LIBRARY NAMES lld-6.0 lld PATHS /usr/lib/llvm-6.0/lib)14find_library(LLD_LIBRARY NAMES lld-8.0 lld PATHS /usr/lib/llvm-8.0/lib)
15if(EXISTS ${LLD_LIBRARY})15if(EXISTS ${LLD_LIBRARY})
16 set(LLD_LIBRARIES ${LLD_LIBRARY})16 set(LLD_LIBRARIES ${LLD_LIBRARY})
17else()17else()
...@@ -19,7 +19,7 @@ else()...@@ -19,7 +19,7 @@ else()
19 string(TOUPPER ${_libname_} _prettylibname_)19 string(TOUPPER ${_libname_} _prettylibname_)
20 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}20 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
21 PATHS21 PATHS
22 /usr/lib/llvm-6.0/lib22 /usr/lib/llvm-8.0/lib
23 /mingw64/lib23 /mingw64/lib
24 /c/msys64/mingw64/lib24 /c/msys64/mingw64/lib
25 c:/msys64/mingw64/lib)25 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+3-3
...@@ -8,12 +8,12 @@...@@ -8,12 +8,12 @@
8# LLVM_LIBDIRS8# LLVM_LIBDIRS
99
10find_program(LLVM_CONFIG_EXE10find_program(LLVM_CONFIG_EXE
11 NAMES llvm-config llvm-config-7 llvm-config-7.011 NAMES llvm-config llvm-config-8 llvm-config-8.0
12 PATHS12 PATHS
13 "/mingw64/bin"13 "/mingw64/bin"
14 "/c/msys64/mingw64/bin"14 "/c/msys64/mingw64/bin"
15 "c:/msys64/mingw64/bin"15 "c:/msys64/mingw64/bin"
16 "C:/Libraries/llvm-7.0.0/bin")16 "C:/Libraries/llvm-8.0.0/bin")
1717
18if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC)18if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC)
19 execute_process(19 execute_process(
...@@ -62,7 +62,7 @@ execute_process(...@@ -62,7 +62,7 @@ execute_process(
62set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})62set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
6363
64if(NOT LLVM_LIBRARIES)64if(NOT LLVM_LIBRARIES)
65 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7 LLVM-7.0)65 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-8 LLVM-8.0)
66endif()66endif()
6767
68link_directories("${CMAKE_PREFIX_PATH}/lib")68link_directories("${CMAKE_PREFIX_PATH}/lib")