authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-02 02:11:46-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-02 02:11:46-04:00
log6f10e3fda6ca3ef2846c87b149d308fa461fdbb0
treeb2561bd5ca0e5a67e02cbee176e6ee972f2945cc
parentf84086132f1a60ce4c46af1720eccb244cc13688
signaturelock-open Commit is signed but in an unrecognized format.

llvm 9.0.0 => llvm 10.0.0

9 files changed, 42 insertions(+), 42 deletions(-)

README.md+4-4
......@@ -27,7 +27,7 @@ Note that you can
2727
2828 * cmake >= 2.8.5
2929 * gcc >= 5.0.0 or clang >= 3.6.0
30 * LLVM, Clang, LLD development libraries == 9.x, compiled with the same gcc or clang version above
30 * LLVM, Clang, LLD development libraries == 10.x, compiled with the same gcc or clang version above
3131 - Use the system package manager, or [build from source](https://github.com/ziglang/zig/wiki/How-to-build-LLVM,-libclang,-and-liblld-from-source#posix).
3232
3333##### Windows
......@@ -37,7 +37,7 @@ Note that you can
3737 - 2015 (version 14)
3838 - 2017 (version 15.8)
3939 - 2019 (version 16)
40 * LLVM, Clang, LLD development libraries == 9.x
40 * LLVM, Clang, LLD development libraries == 10.x
4141 - Use the [pre-built binaries](https://github.com/ziglang/zig/wiki/Building-Zig-on-Windows) or [build from source](https://github.com/ziglang/zig/wiki/How-to-build-LLVM,-libclang,-and-liblld-from-source#windows).
4242
4343#### Instructions
......@@ -54,8 +54,8 @@ make install
5454##### MacOS
5555
5656```
57brew install cmake llvm@9
58brew outdated llvm@9 || brew upgrade llvm@9
57brew install cmake llvm@10
58brew outdated llvm@10 || brew upgrade llvm@10
5959mkdir build
6060cd build
6161cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm)
ci/azure/macos_script+7-7
......@@ -8,7 +8,7 @@ system_profiler SPHardwareDataType
88brew install s3cmd gcc@8
99
1010ZIGDIR="$(pwd)"
11CACHE_BASENAME="llvm+clang-9.0.0-macos-x86_64-gcc8-release"
11CACHE_BASENAME="llvm+clang-10.0.0-macos-x86_64-gcc8-release"
1212PREFIX="$HOME/$CACHE_BASENAME"
1313TMPDIR="$HOME/tmpz"
1414JOBS="-j2"
......@@ -44,18 +44,18 @@ else
4444 rm $PREFIX/lib/libz*dylib
4545
4646 cd $TMPDIR
47 wget https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz
48 tar xf llvm-9.0.0.src.tar.xz
49 cd llvm-9.0.0.src/
47 wget https://releases.llvm.org/10.0.0/llvm-10.0.0.src.tar.xz
48 tar xf llvm-10.0.0.src.tar.xz
49 cd llvm-10.0.0.src/
5050 mkdir build
5151 cd build
5252 cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR" -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_TERMINFO=OFF
5353 make $JOBS install
5454
5555 cd $TMPDIR
56 wget https://releases.llvm.org/9.0.0/cfe-9.0.0.src.tar.xz
57 tar xf cfe-9.0.0.src.tar.xz
58 cd cfe-9.0.0.src/
56 wget https://releases.llvm.org/10.0.0/cfe-10.0.0.src.tar.xz
57 tar xf cfe-10.0.0.src.tar.xz
58 cd cfe-10.0.0.src/
5959 mkdir build
6060 cd build
6161 cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release
ci/azure/windows_install+2-2
......@@ -6,5 +6,5 @@ set -e
66pacman -Su --needed --noconfirm
77pacman -S --needed --noconfirm wget p7zip python3-pip
88pip install s3cmd
9wget -nv "https://ziglang.org/deps/llvm%2bclang-9.0.0-win64-msvc-release.tar.xz"
10tar xf llvm+clang-9.0.0-win64-msvc-release.tar.xz
9wget -nv "https://ziglang.org/deps/llvm%2bclang-10.0.0-win64-msvc-release.tar.xz"
10tar xf llvm+clang-10.0.0-win64-msvc-release.tar.xz
ci/azure/windows_script.bat+1-1
......@@ -11,7 +11,7 @@ SET "MSYSTEM=%PREVMSYSTEM%"
1111
1212SET "ZIGBUILDDIR=%SRCROOT%\build"
1313SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-10.0.0-win64-msvc-release"
1515
1616call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
1717
ci/srht/freebsd_script+1-1
......@@ -4,7 +4,7 @@ set -x
44set -e
55
66ZIGDIR="$(pwd)"
7CACHE_BASENAME="llvm+clang-9.0.0-freebsd-x86_64-release"
7CACHE_BASENAME="llvm+clang-10.0.0-freebsd-x86_64-release"
88PREFIX="$HOME/$CACHE_BASENAME"
99JOBS="-j$(sysctl -n hw.ncpu)"
1010
cmake/Findclang.cmake+8-8
......@@ -38,10 +38,10 @@ if(MSVC)
3838else()
3939 find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
4040 PATHS
41 /usr/lib/llvm/9/include
42 /usr/lib/llvm-9/include
43 /usr/lib/llvm-9.0/include
44 /usr/local/llvm90/include
41 /usr/lib/llvm/10/include
42 /usr/lib/llvm-10/include
43 /usr/lib/llvm-10.0/include
44 /usr/local/llvm100/include
4545 /mingw64/include)
4646
4747 macro(FIND_AND_ADD_CLANG_LIB _libname_)
......@@ -49,10 +49,10 @@ else()
4949 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
5050 PATHS
5151 ${CLANG_LIBDIRS}
52 /usr/lib/llvm/9/lib
53 /usr/lib/llvm-9/lib
54 /usr/lib/llvm-9.0/lib
55 /usr/local/llvm90/lib
52 /usr/lib/llvm/10/lib
53 /usr/lib/llvm-10/lib
54 /usr/lib/llvm-10.0/lib
55 /usr/local/llvm100/lib
5656 /mingw64/lib
5757 /c/msys64/mingw64/lib
5858 c:\\msys64\\mingw64\\lib)
cmake/Findlld.cmake+7-7
......@@ -8,14 +8,14 @@
88
99find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
1010 PATHS
11 /usr/lib/llvm-9.0/include
12 /usr/local/llvm90/include
11 /usr/lib/llvm-10.0/include
12 /usr/local/llvm100/include
1313 /mingw64/include)
1414
15find_library(LLD_LIBRARY NAMES lld-9.0 lld90 lld
15find_library(LLD_LIBRARY NAMES lld-10.0 lld100 lld
1616 PATHS
17 /usr/lib/llvm-9.0/lib
18 /usr/local/llvm90/lib
17 /usr/lib/llvm-10.0/lib
18 /usr/local/llvm100/lib
1919)
2020if(EXISTS ${LLD_LIBRARY})
2121 set(LLD_LIBRARIES ${LLD_LIBRARY})
......@@ -24,8 +24,8 @@ else()
2424 string(TOUPPER ${_libname_} _prettylibname_)
2525 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
2626 PATHS
27 /usr/lib/llvm-9.0/lib
28 /usr/local/llvm90/lib
27 /usr/lib/llvm-10.0/lib
28 /usr/local/llvm100/lib
2929 /mingw64/lib
3030 /c/msys64/mingw64/lib
3131 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+9-9
......@@ -8,12 +8,12 @@
88# LLVM_LIBDIRS
99
1010find_program(LLVM_CONFIG_EXE
11 NAMES llvm-config-9 llvm-config-9.0 llvm-config90 llvm-config
11 NAMES llvm-config-10 llvm-config-10.0 llvm-config100 llvm-config
1212 PATHS
1313 "/mingw64/bin"
1414 "/c/msys64/mingw64/bin"
1515 "c:/msys64/mingw64/bin"
16 "C:/Libraries/llvm-9.0.0/bin")
16 "C:/Libraries/llvm-10.0.0/bin")
1717
1818if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
1919 message(FATAL_ERROR "unable to find llvm-config")
......@@ -28,14 +28,14 @@ execute_process(
2828 OUTPUT_VARIABLE LLVM_CONFIG_VERSION
2929 OUTPUT_STRIP_TRAILING_WHITESPACE)
3030
31if("${LLVM_CONFIG_VERSION}" VERSION_LESS 9)
32 message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}")
31if("${LLVM_CONFIG_VERSION}" VERSION_LESS 10)
32 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}")
3333endif()
34if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 10)
35 message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}")
34if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 11)
35 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}")
3636endif()
37if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 10)
38 message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}")
37if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 11)
38 message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}")
3939endif()
4040
4141execute_process(
......@@ -113,7 +113,7 @@ execute_process(
113113set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
114114
115115if(NOT LLVM_LIBRARIES)
116 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-9 LLVM-9.0)
116 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-10 LLVM-10.0)
117117endif()
118118
119119link_directories("${CMAKE_PREFIX_PATH}/lib")
doc/langref.html.in+3-3
......@@ -5882,7 +5882,7 @@ volatile (
58825882// Next is the output constraint string. This feature is still
58835883// considered unstable in Zig, and so LLVM/GCC documentation
58845884// must be used to understand the semantics.
5885// http://releases.llvm.org/9.0.0/docs/LangRef.html#inline-asm-constraint-string
5885// http://releases.llvm.org/10.0.0/docs/LangRef.html#inline-asm-constraint-string
58865886// https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html
58875887// In this example, the constraint string means "the result value of
58885888// this inline assembly instruction is whatever is in $rax".
......@@ -5923,7 +5923,7 @@ volatile (
59235923 <p>
59245924 Output constraints are still considered to be unstable in Zig, and
59255925 so
5926 <a href="http://releases.llvm.org/9.0.0/docs/LangRef.html#inline-asm-constraint-string">LLVM documentation</a>
5926 <a href="http://releases.llvm.org/10.0.0/docs/LangRef.html#inline-asm-constraint-string">LLVM documentation</a>
59275927 and
59285928 <a href="https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html">GCC documentation</a>
59295929 must be used to understand the semantics.
......@@ -5938,7 +5938,7 @@ volatile (
59385938 <p>
59395939 Input constraints are still considered to be unstable in Zig, and
59405940 so
5941 <a href="http://releases.llvm.org/9.0.0/docs/LangRef.html#inline-asm-constraint-string">LLVM documentation</a>
5941 <a href="http://releases.llvm.org/10.0.0/docs/LangRef.html#inline-asm-constraint-string">LLVM documentation</a>
59425942 and
59435943 <a href="https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html">GCC documentation</a>
59445944 must be used to understand the semantics.