| author | |
| committer | |
| log | 6f10e3fda6ca3ef2846c87b149d308fa461fdbb0 |
| tree | b2561bd5ca0e5a67e02cbee176e6ee972f2945cc |
| parent | f84086132f1a60ce4c46af1720eccb244cc13688 |
| signature |
9 files changed, 42 insertions(+), 42 deletions(-)
README.md+4-4| ... | @@ -27,7 +27,7 @@ Note that you can | ... | @@ -27,7 +27,7 @@ Note that you can |
| 27 | 27 | ||
| 28 | * cmake >= 2.8.5 | 28 | * cmake >= 2.8.5 |
| 29 | * gcc >= 5.0.0 or clang >= 3.6.0 | 29 | * 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 |
| 31 | - 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). | 31 | - 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). |
| 32 | 32 | ||
| 33 | ##### Windows | 33 | ##### Windows |
| ... | @@ -37,7 +37,7 @@ Note that you can | ... | @@ -37,7 +37,7 @@ Note that you can |
| 37 | - 2015 (version 14) | 37 | - 2015 (version 14) |
| 38 | - 2017 (version 15.8) | 38 | - 2017 (version 15.8) |
| 39 | - 2019 (version 16) | 39 | - 2019 (version 16) |
| 40 | * LLVM, Clang, LLD development libraries == 9.x | 40 | * LLVM, Clang, LLD development libraries == 10.x |
| 41 | - 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). | 41 | - 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). |
| 42 | 42 | ||
| 43 | #### Instructions | 43 | #### Instructions |
| ... | @@ -54,8 +54,8 @@ make install | ... | @@ -54,8 +54,8 @@ make install |
| 54 | ##### MacOS | 54 | ##### MacOS |
| 55 | 55 | ||
| 56 | ``` | 56 | ``` |
| 57 | brew install cmake llvm@9 | 57 | brew install cmake llvm@10 |
| 58 | brew outdated llvm@9 || brew upgrade llvm@9 | 58 | brew outdated llvm@10 || brew upgrade llvm@10 |
| 59 | mkdir build | 59 | mkdir build |
| 60 | cd build | 60 | cd build |
| 61 | cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm) | 61 | cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm) |
ci/azure/macos_script+7-7| ... | @@ -8,7 +8,7 @@ system_profiler SPHardwareDataType | ... | @@ -8,7 +8,7 @@ system_profiler SPHardwareDataType |
| 8 | brew install s3cmd gcc@8 | 8 | brew install s3cmd gcc@8 |
| 9 | 9 | ||
| 10 | ZIGDIR="$(pwd)" | 10 | ZIGDIR="$(pwd)" |
| 11 | CACHE_BASENAME="llvm+clang-9.0.0-macos-x86_64-gcc8-release" | 11 | CACHE_BASENAME="llvm+clang-10.0.0-macos-x86_64-gcc8-release" |
| 12 | PREFIX="$HOME/$CACHE_BASENAME" | 12 | PREFIX="$HOME/$CACHE_BASENAME" |
| 13 | TMPDIR="$HOME/tmpz" | 13 | TMPDIR="$HOME/tmpz" |
| 14 | JOBS="-j2" | 14 | JOBS="-j2" |
| ... | @@ -44,18 +44,18 @@ else | ... | @@ -44,18 +44,18 @@ else |
| 44 | rm $PREFIX/lib/libz*dylib | 44 | rm $PREFIX/lib/libz*dylib |
| 45 | 45 | ||
| 46 | cd $TMPDIR | 46 | cd $TMPDIR |
| 47 | wget https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz | 47 | wget https://releases.llvm.org/10.0.0/llvm-10.0.0.src.tar.xz |
| 48 | tar xf llvm-9.0.0.src.tar.xz | 48 | tar xf llvm-10.0.0.src.tar.xz |
| 49 | cd llvm-9.0.0.src/ | 49 | cd llvm-10.0.0.src/ |
| 50 | mkdir build | 50 | mkdir build |
| 51 | cd build | 51 | cd build |
| 52 | 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 | 52 | 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 |
| 53 | make $JOBS install | 53 | make $JOBS install |
| 54 | 54 | ||
| 55 | cd $TMPDIR | 55 | cd $TMPDIR |
| 56 | wget https://releases.llvm.org/9.0.0/cfe-9.0.0.src.tar.xz | 56 | wget https://releases.llvm.org/10.0.0/cfe-10.0.0.src.tar.xz |
| 57 | tar xf cfe-9.0.0.src.tar.xz | 57 | tar xf cfe-10.0.0.src.tar.xz |
| 58 | cd cfe-9.0.0.src/ | 58 | cd cfe-10.0.0.src/ |
| 59 | mkdir build | 59 | mkdir build |
| 60 | cd build | 60 | cd build |
| 61 | cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release | 61 | 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 | ... | @@ -6,5 +6,5 @@ set -e |
| 6 | pacman -Su --needed --noconfirm | 6 | pacman -Su --needed --noconfirm |
| 7 | pacman -S --needed --noconfirm wget p7zip python3-pip | 7 | pacman -S --needed --noconfirm wget p7zip python3-pip |
| 8 | pip install s3cmd | 8 | pip install s3cmd |
| 9 | wget -nv "https://ziglang.org/deps/llvm%2bclang-9.0.0-win64-msvc-release.tar.xz" | 9 | wget -nv "https://ziglang.org/deps/llvm%2bclang-10.0.0-win64-msvc-release.tar.xz" |
| 10 | tar xf llvm+clang-9.0.0-win64-msvc-release.tar.xz | 10 | tar 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%" | ... | @@ -11,7 +11,7 @@ SET "MSYSTEM=%PREVMSYSTEM%" |
| 11 | 11 | ||
| 12 | SET "ZIGBUILDDIR=%SRCROOT%\build" | 12 | SET "ZIGBUILDDIR=%SRCROOT%\build" |
| 13 | SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist" | 13 | SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist" |
| 14 | SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release" | 14 | SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-10.0.0-win64-msvc-release" |
| 15 | 15 | ||
| 16 | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 | 16 | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 |
| 17 | 17 |
ci/srht/freebsd_script+1-1| ... | @@ -4,7 +4,7 @@ set -x | ... | @@ -4,7 +4,7 @@ set -x |
| 4 | set -e | 4 | set -e |
| 5 | 5 | ||
| 6 | ZIGDIR="$(pwd)" | 6 | ZIGDIR="$(pwd)" |
| 7 | CACHE_BASENAME="llvm+clang-9.0.0-freebsd-x86_64-release" | 7 | CACHE_BASENAME="llvm+clang-10.0.0-freebsd-x86_64-release" |
| 8 | PREFIX="$HOME/$CACHE_BASENAME" | 8 | PREFIX="$HOME/$CACHE_BASENAME" |
| 9 | JOBS="-j$(sysctl -n hw.ncpu)" | 9 | JOBS="-j$(sysctl -n hw.ncpu)" |
| 10 | 10 |
cmake/Findclang.cmake+8-8| ... | @@ -38,10 +38,10 @@ if(MSVC) | ... | @@ -38,10 +38,10 @@ if(MSVC) |
| 38 | else() | 38 | else() |
| 39 | find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h | 39 | find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h |
| 40 | PATHS | 40 | PATHS |
| 41 | /usr/lib/llvm/9/include | 41 | /usr/lib/llvm/10/include |
| 42 | /usr/lib/llvm-9/include | 42 | /usr/lib/llvm-10/include |
| 43 | /usr/lib/llvm-9.0/include | 43 | /usr/lib/llvm-10.0/include |
| 44 | /usr/local/llvm90/include | 44 | /usr/local/llvm100/include |
| 45 | /mingw64/include) | 45 | /mingw64/include) |
| 46 | 46 | ||
| 47 | macro(FIND_AND_ADD_CLANG_LIB _libname_) | 47 | macro(FIND_AND_ADD_CLANG_LIB _libname_) |
| ... | @@ -49,10 +49,10 @@ else() | ... | @@ -49,10 +49,10 @@ else() |
| 49 | find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} | 49 | find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} |
| 50 | PATHS | 50 | PATHS |
| 51 | ${CLANG_LIBDIRS} | 51 | ${CLANG_LIBDIRS} |
| 52 | /usr/lib/llvm/9/lib | 52 | /usr/lib/llvm/10/lib |
| 53 | /usr/lib/llvm-9/lib | 53 | /usr/lib/llvm-10/lib |
| 54 | /usr/lib/llvm-9.0/lib | 54 | /usr/lib/llvm-10.0/lib |
| 55 | /usr/local/llvm90/lib | 55 | /usr/local/llvm100/lib |
| 56 | /mingw64/lib | 56 | /mingw64/lib |
| 57 | /c/msys64/mingw64/lib | 57 | /c/msys64/mingw64/lib |
| 58 | c:\\msys64\\mingw64\\lib) | 58 | c:\\msys64\\mingw64\\lib) |
cmake/Findlld.cmake+7-7| ... | @@ -8,14 +8,14 @@ | ... | @@ -8,14 +8,14 @@ |
| 8 | 8 | ||
| 9 | find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h | 9 | find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h |
| 10 | PATHS | 10 | PATHS |
| 11 | /usr/lib/llvm-9.0/include | 11 | /usr/lib/llvm-10.0/include |
| 12 | /usr/local/llvm90/include | 12 | /usr/local/llvm100/include |
| 13 | /mingw64/include) | 13 | /mingw64/include) |
| 14 | 14 | ||
| 15 | find_library(LLD_LIBRARY NAMES lld-9.0 lld90 lld | 15 | find_library(LLD_LIBRARY NAMES lld-10.0 lld100 lld |
| 16 | PATHS | 16 | PATHS |
| 17 | /usr/lib/llvm-9.0/lib | 17 | /usr/lib/llvm-10.0/lib |
| 18 | /usr/local/llvm90/lib | 18 | /usr/local/llvm100/lib |
| 19 | ) | 19 | ) |
| 20 | if(EXISTS ${LLD_LIBRARY}) | 20 | if(EXISTS ${LLD_LIBRARY}) |
| 21 | set(LLD_LIBRARIES ${LLD_LIBRARY}) | 21 | set(LLD_LIBRARIES ${LLD_LIBRARY}) |
| ... | @@ -24,8 +24,8 @@ else() | ... | @@ -24,8 +24,8 @@ else() |
| 24 | string(TOUPPER ${_libname_} _prettylibname_) | 24 | string(TOUPPER ${_libname_} _prettylibname_) |
| 25 | find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} | 25 | find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} |
| 26 | PATHS | 26 | PATHS |
| 27 | /usr/lib/llvm-9.0/lib | 27 | /usr/lib/llvm-10.0/lib |
| 28 | /usr/local/llvm90/lib | 28 | /usr/local/llvm100/lib |
| 29 | /mingw64/lib | 29 | /mingw64/lib |
| 30 | /c/msys64/mingw64/lib | 30 | /c/msys64/mingw64/lib |
| 31 | c:/msys64/mingw64/lib) | 31 | c:/msys64/mingw64/lib) |
cmake/Findllvm.cmake+9-9| ... | @@ -8,12 +8,12 @@ | ... | @@ -8,12 +8,12 @@ |
| 8 | # LLVM_LIBDIRS | 8 | # LLVM_LIBDIRS |
| 9 | 9 | ||
| 10 | find_program(LLVM_CONFIG_EXE | 10 | find_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 |
| 12 | PATHS | 12 | 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-9.0.0/bin") | 16 | "C:/Libraries/llvm-10.0.0/bin") |
| 17 | 17 | ||
| 18 | if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") | 18 | if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") |
| 19 | message(FATAL_ERROR "unable to find llvm-config") | 19 | message(FATAL_ERROR "unable to find llvm-config") |
| ... | @@ -28,14 +28,14 @@ execute_process( | ... | @@ -28,14 +28,14 @@ execute_process( |
| 28 | 	OUTPUT_VARIABLE LLVM_CONFIG_VERSION | 28 | 	OUTPUT_VARIABLE LLVM_CONFIG_VERSION |
| 29 | 	OUTPUT_STRIP_TRAILING_WHITESPACE) | 29 | 	OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 30 | 30 | ||
| 31 | if("${LLVM_CONFIG_VERSION}" VERSION_LESS 9) | 31 | if("${LLVM_CONFIG_VERSION}" VERSION_LESS 10) |
| 32 | message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}") | 32 | message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}") |
| 33 | endif() | 33 | endif() |
| 34 | if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 10) | 34 | if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 11) |
| 35 | message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}") | 35 | message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}") |
| 36 | endif() | 36 | endif() |
| 37 | if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 10) | 37 | if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 11) |
| 38 | message(FATAL_ERROR "expected LLVM 9.x but found ${LLVM_CONFIG_VERSION}") | 38 | message(FATAL_ERROR "expected LLVM 10.x but found ${LLVM_CONFIG_VERSION}") |
| 39 | endif() | 39 | endif() |
| 40 | 40 | ||
| 41 | execute_process( | 41 | execute_process( |
| ... | @@ -113,7 +113,7 @@ execute_process( | ... | @@ -113,7 +113,7 @@ execute_process( |
| 113 | set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) | 113 | set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) |
| 114 | 114 | ||
| 115 | if(NOT LLVM_LIBRARIES) | 115 | if(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) |
| 117 | endif() | 117 | endif() |
| 118 | 118 | ||
| 119 | link_directories("${CMAKE_PREFIX_PATH}/lib") | 119 | link_directories("${CMAKE_PREFIX_PATH}/lib") |
doc/langref.html.in+3-3| ... | @@ -5882,7 +5882,7 @@ volatile ( | ... | @@ -5882,7 +5882,7 @@ volatile ( |
| 5882 | // Next is the output constraint string. This feature is still | 5882 | // Next is the output constraint string. This feature is still |
| 5883 | // considered unstable in Zig, and so LLVM/GCC documentation | 5883 | // considered unstable in Zig, and so LLVM/GCC documentation |
| 5884 | // must be used to understand the semantics. | 5884 | // 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 |
| 5886 | // https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html | 5886 | // https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html |
| 5887 | // In this example, the constraint string means "the result value of | 5887 | // In this example, the constraint string means "the result value of |
| 5888 | // this inline assembly instruction is whatever is in $rax". | 5888 | // this inline assembly instruction is whatever is in $rax". |
| ... | @@ -5923,7 +5923,7 @@ volatile ( | ... | @@ -5923,7 +5923,7 @@ volatile ( |
| 5923 | <p> | 5923 | <p> |
| 5924 | Output constraints are still considered to be unstable in Zig, and | 5924 | Output constraints are still considered to be unstable in Zig, and |
| 5925 | so | 5925 | 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> |
| 5927 | and | 5927 | and |
| 5928 | <a href="https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html">GCC documentation</a> | 5928 | <a href="https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html">GCC documentation</a> |
| 5929 | must be used to understand the semantics. | 5929 | must be used to understand the semantics. |
| ... | @@ -5938,7 +5938,7 @@ volatile ( | ... | @@ -5938,7 +5938,7 @@ volatile ( |
| 5938 | <p> | 5938 | <p> |
| 5939 | Input constraints are still considered to be unstable in Zig, and | 5939 | Input constraints are still considered to be unstable in Zig, and |
| 5940 | so | 5940 | 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> |
| 5942 | and | 5942 | and |
| 5943 | <a href="https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html">GCC documentation</a> | 5943 | <a href="https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html">GCC documentation</a> |
| 5944 | must be used to understand the semantics. | 5944 | must be used to understand the semantics. |