authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-03-22 15:32:47-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-03-22 15:39:50-04:00
log62668e3e6b3c07d4145a7de3ebb9d5fdd728d75e
tree76a96a436af0ed36195f85fcad8e05d31d92440c
parent53588f4f124bb713cc2c67c721d5f4e3586b7d79

update to llvm 7.0.0

13 files changed, 34 insertions(+), 34 deletions(-)

README.md+5-5
...@@ -125,14 +125,14 @@ libc. Create demo games using Zig....@@ -125,14 +125,14 @@ libc. Create demo games using Zig.
125125
126 * cmake >= 2.8.5126 * cmake >= 2.8.5
127 * gcc >= 5.0.0 or clang >= 3.6.0127 * gcc >= 5.0.0 or clang >= 3.6.0
128 * LLVM, Clang, LLD development libraries == 6.x, compiled with the same gcc or clang version above128 * LLVM, Clang, LLD development libraries == 7.x, compiled with the same gcc or clang version above
129 - These depend on zlib and libxml2.129 - These depend on zlib and libxml2.
130130
131##### Windows131##### Windows
132132
133 * cmake >= 2.8.5133 * cmake >= 2.8.5
134 * Microsoft Visual Studio 2015134 * Microsoft Visual Studio 2015
135 * LLVM, Clang, LLD development libraries == 6.x, compiled with the same MSVC version above135 * LLVM, Clang, LLD development libraries == 7.x, compiled with the same MSVC version above
136136
137#### Instructions137#### Instructions
138138
...@@ -156,11 +156,11 @@ make install...@@ -156,11 +156,11 @@ make install
156`ZIG_LIBC_LIB_DIR` and `ZIG_LIBC_STATIC_LIB_DIR` are unused.156`ZIG_LIBC_LIB_DIR` and `ZIG_LIBC_STATIC_LIB_DIR` are unused.
157157
158```158```
159brew install cmake llvm@6159brew install cmake llvm@7
160brew outdated llvm@6 || brew upgrade llvm@6160brew outdated llvm@7 || brew upgrade llvm@7
161mkdir build161mkdir build
162cd build162cd build
163cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_INSTALL_PREFIX=$(pwd)163cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/ -DCMAKE_INSTALL_PREFIX=$(pwd)
164make install164make install
165./zig build --build-file ../build.zig test165./zig build --build-file ../build.zig test
166```166```
ci/appveyor/appveyor.yml+1-1
...@@ -6,5 +6,5 @@ build_script:...@@ -6,5 +6,5 @@ build_script:
6after_build:6after_build:
7 - '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat'7 - '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat'
8cache:8cache:
9 - 'llvm+clang-5.0.1-win64-msvc-release.tar.xz'
10 - 'llvm+clang-6.0.0-win64-msvc-release.tar.xz'9 - 'llvm+clang-6.0.0-win64-msvc-release.tar.xz'
10 - 'llvm+clang-7.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-6.0.0-win64-msvc-release.tar.xz"" ]; then echo 'skipping LLVM download'; else wget 'https://s3.amazonaws.com/ziglang.org/deps/llvm%%2bclang-6.0.0-win64-msvc-release.tar.xz'; fi && tar xf llvm+clang-6.0.0-win64-msvc-release.tar.xz" || exit /b10bash -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 /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-6.0.0-win64-msvc-release"16SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-7.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 14.0\VC\vcvarsall.bat" x86_amd6419call "C:\Program Files (x86)\Microsoft Visual Studio 14.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-6.0 main" >> /etc/apt/sources.list'5sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7.0 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 clang-6.0 libclang-6.0 libclang-6.0-dev llvm-6.0 llvm-6.0-dev liblld-6.0 liblld-6.0-dev cmake wine1.6-amd647sudo apt-get install -y clang-7.0 libclang-7.0 libclang-7.0-dev llvm-7.0 llvm-7.0-dev liblld-7.0 liblld-7.0-dev cmake wine1.6-amd64
ci/travis_linux_script+2-2
...@@ -3,8 +3,8 @@...@@ -3,8 +3,8 @@
3set -x3set -x
4set -e4set -e
55
6export CC=clang-6.06export CC=clang-7.0
7export CXX=clang++-6.07export CXX=clang++-7.0
8echo $PATH8echo $PATH
9mkdir build9mkdir build
10cd build10cd build
ci/travis_osx_install+2-2
...@@ -2,6 +2,6 @@...@@ -2,6 +2,6 @@
22
3set -x3set -x
44
5brew install llvm@65brew install llvm@7
6brew outdated llvm@6 || brew upgrade llvm@66brew outdated llvm@7 || brew upgrade llvm@7
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@6/ -DCMAKE_INSTALL_PREFIX=$(pwd)8cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/ -DCMAKE_INSTALL_PREFIX=$(pwd)
9make VERBOSE=19make VERBOSE=1
10make install10make install
1111
cmake/Findclang.cmake+4-4
...@@ -27,8 +27,8 @@ if(MSVC)...@@ -27,8 +27,8 @@ 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/6/include30 /usr/lib/llvm/7/include
31 /usr/lib/llvm-6.0/include31 /usr/lib/llvm-7.0/include
32 /mingw64/include)32 /mingw64/include)
3333
34 macro(FIND_AND_ADD_CLANG_LIB _libname_)34 macro(FIND_AND_ADD_CLANG_LIB _libname_)
...@@ -36,8 +36,8 @@ else()...@@ -36,8 +36,8 @@ else()
36 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}36 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
37 PATHS37 PATHS
38 ${CLANG_LIBDIRS}38 ${CLANG_LIBDIRS}
39 /usr/lib/llvm/6/lib39 /usr/lib/llvm/7/lib
40 /usr/lib/llvm-6.0/lib40 /usr/lib/llvm-7.0/lib
41 /mingw64/lib41 /mingw64/lib
42 /c/msys64/mingw64/lib42 /c/msys64/mingw64/lib
43 c:\\msys64\\mingw64\\lib)43 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-6.0 llvm-config11 NAMES llvm-config-7.0 llvm-config
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-6.0.0/bin")16 "C:/Libraries/llvm-7.0.0/bin")
1717
18if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug"))18if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug"))
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-6.0 LLVM-6)65 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7.0 LLVM-7)
66endif()66endif()
6767
68link_directories("${CMAKE_PREFIX_PATH}/lib")68link_directories("${CMAKE_PREFIX_PATH}/lib")
src/target.cpp+7-8
...@@ -148,7 +148,6 @@ static const Os os_list[] = {...@@ -148,7 +148,6 @@ static const Os os_list[] = {
148 OsRTEMS,148 OsRTEMS,
149 OsNaCl, // Native Client149 OsNaCl, // Native Client
150 OsCNK, // BG/P Compute-Node Kernel150 OsCNK, // BG/P Compute-Node Kernel
151 OsBitrig,
152 OsAIX,151 OsAIX,
153 OsCUDA, // NVIDIA CUDA152 OsCUDA, // NVIDIA CUDA
154 OsNVCL, // NVIDIA OpenCL153 OsNVCL, // NVIDIA OpenCL
...@@ -159,6 +158,7 @@ static const Os os_list[] = {...@@ -159,6 +158,7 @@ static const Os os_list[] = {
159 OsWatchOS, // Apple watchOS158 OsWatchOS, // Apple watchOS
160 OsMesa3D,159 OsMesa3D,
161 OsContiki,160 OsContiki,
161 OsAMDPAL,
162 OsZen,162 OsZen,
163};163};
164164
...@@ -181,7 +181,6 @@ static const ZigLLVM_EnvironmentType environ_list[] = {...@@ -181,7 +181,6 @@ static const ZigLLVM_EnvironmentType environ_list[] = {
181 ZigLLVM_MSVC,181 ZigLLVM_MSVC,
182 ZigLLVM_Itanium,182 ZigLLVM_Itanium,
183 ZigLLVM_Cygnus,183 ZigLLVM_Cygnus,
184 ZigLLVM_AMDOpenCL,
185 ZigLLVM_CoreCLR,184 ZigLLVM_CoreCLR,
186 ZigLLVM_OpenCL,185 ZigLLVM_OpenCL,
187 ZigLLVM_Simulator,186 ZigLLVM_Simulator,
...@@ -280,8 +279,6 @@ static ZigLLVM_OSType get_llvm_os_type(Os os_type) {...@@ -280,8 +279,6 @@ static ZigLLVM_OSType get_llvm_os_type(Os os_type) {
280 return ZigLLVM_NaCl;279 return ZigLLVM_NaCl;
281 case OsCNK:280 case OsCNK:
282 return ZigLLVM_CNK;281 return ZigLLVM_CNK;
283 case OsBitrig:
284 return ZigLLVM_Bitrig;
285 case OsAIX:282 case OsAIX:
286 return ZigLLVM_AIX;283 return ZigLLVM_AIX;
287 case OsCUDA:284 case OsCUDA:
...@@ -302,6 +299,8 @@ static ZigLLVM_OSType get_llvm_os_type(Os os_type) {...@@ -302,6 +299,8 @@ static ZigLLVM_OSType get_llvm_os_type(Os os_type) {
302 return ZigLLVM_Mesa3D;299 return ZigLLVM_Mesa3D;
303 case OsContiki:300 case OsContiki:
304 return ZigLLVM_Contiki;301 return ZigLLVM_Contiki;
302 case OsAMDPAL:
303 return ZigLLVM_AMDPAL;
305 }304 }
306 zig_unreachable();305 zig_unreachable();
307}306}
...@@ -349,8 +348,6 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {...@@ -349,8 +348,6 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
349 return OsNaCl;348 return OsNaCl;
350 case ZigLLVM_CNK:349 case ZigLLVM_CNK:
351 return OsCNK;350 return OsCNK;
352 case ZigLLVM_Bitrig:
353 return OsBitrig;
354 case ZigLLVM_AIX:351 case ZigLLVM_AIX:
355 return OsAIX;352 return OsAIX;
356 case ZigLLVM_CUDA:353 case ZigLLVM_CUDA:
...@@ -371,6 +368,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {...@@ -371,6 +368,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
371 return OsMesa3D;368 return OsMesa3D;
372 case ZigLLVM_Contiki:369 case ZigLLVM_Contiki:
373 return OsContiki;370 return OsContiki;
371 case ZigLLVM_AMDPAL:
372 return OsAMDPAL;
374 }373 }
375 zig_unreachable();374 zig_unreachable();
376}375}
...@@ -400,7 +399,6 @@ const char *get_target_os_name(Os os_type) {...@@ -400,7 +399,6 @@ const char *get_target_os_name(Os os_type) {
400 case OsRTEMS:399 case OsRTEMS:
401 case OsNaCl: // Native Client400 case OsNaCl: // Native Client
402 case OsCNK: // BG/P Compute-Node Kernel401 case OsCNK: // BG/P Compute-Node Kernel
403 case OsBitrig:
404 case OsAIX:402 case OsAIX:
405 case OsCUDA: // NVIDIA CUDA403 case OsCUDA: // NVIDIA CUDA
406 case OsNVCL: // NVIDIA OpenCL404 case OsNVCL: // NVIDIA OpenCL
...@@ -411,6 +409,7 @@ const char *get_target_os_name(Os os_type) {...@@ -411,6 +409,7 @@ const char *get_target_os_name(Os os_type) {
411 case OsWatchOS: // Apple watchOS409 case OsWatchOS: // Apple watchOS
412 case OsMesa3D:410 case OsMesa3D:
413 case OsContiki:411 case OsContiki:
412 case OsAMDPAL:
414 return ZigLLVMGetOSTypeName(get_llvm_os_type(os_type));413 return ZigLLVMGetOSTypeName(get_llvm_os_type(os_type));
415 }414 }
416 zig_unreachable();415 zig_unreachable();
...@@ -749,7 +748,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {...@@ -749,7 +748,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
749 case OsRTEMS:748 case OsRTEMS:
750 case OsNaCl:749 case OsNaCl:
751 case OsCNK:750 case OsCNK:
752 case OsBitrig:
753 case OsAIX:751 case OsAIX:
754 case OsCUDA:752 case OsCUDA:
755 case OsNVCL:753 case OsNVCL:
...@@ -761,6 +759,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {...@@ -761,6 +759,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
761 case OsMesa3D:759 case OsMesa3D:
762 case OsFuchsia:760 case OsFuchsia:
763 case OsContiki:761 case OsContiki:
762 case OsAMDPAL:
764 zig_panic("TODO c type size in bits for this target");763 zig_panic("TODO c type size in bits for this target");
765 }764 }
766 zig_unreachable();765 zig_unreachable();
src/target.hpp+2-1
...@@ -17,6 +17,7 @@ struct ArchType {...@@ -17,6 +17,7 @@ struct ArchType {
17 ZigLLVM_SubArchType sub_arch;17 ZigLLVM_SubArchType sub_arch;
18};18};
1919
20// Synchronize with target.cpp::os_list
20enum Os {21enum Os {
21 OsFreestanding,22 OsFreestanding,
22 OsAnanas,23 OsAnanas,
...@@ -38,7 +39,6 @@ enum Os {...@@ -38,7 +39,6 @@ enum Os {
38 OsRTEMS,39 OsRTEMS,
39 OsNaCl, // Native Client40 OsNaCl, // Native Client
40 OsCNK, // BG/P Compute-Node Kernel41 OsCNK, // BG/P Compute-Node Kernel
41 OsBitrig,
42 OsAIX,42 OsAIX,
43 OsCUDA, // NVIDIA CUDA43 OsCUDA, // NVIDIA CUDA
44 OsNVCL, // NVIDIA OpenCL44 OsNVCL, // NVIDIA OpenCL
...@@ -49,6 +49,7 @@ enum Os {...@@ -49,6 +49,7 @@ enum Os {
49 OsWatchOS, // Apple watchOS49 OsWatchOS, // Apple watchOS
50 OsMesa3D,50 OsMesa3D,
51 OsContiki,51 OsContiki,
52 OsAMDPAL,
52 OsZen,53 OsZen,
53};54};
5455
src/zig_llvm.h+3-3
...@@ -333,7 +333,6 @@ enum ZigLLVM_OSType {...@@ -333,7 +333,6 @@ enum ZigLLVM_OSType {
333 ZigLLVM_RTEMS,333 ZigLLVM_RTEMS,
334 ZigLLVM_NaCl, // Native Client334 ZigLLVM_NaCl, // Native Client
335 ZigLLVM_CNK, // BG/P Compute-Node Kernel335 ZigLLVM_CNK, // BG/P Compute-Node Kernel
336 ZigLLVM_Bitrig,
337 ZigLLVM_AIX,336 ZigLLVM_AIX,
338 ZigLLVM_CUDA, // NVIDIA CUDA337 ZigLLVM_CUDA, // NVIDIA CUDA
339 ZigLLVM_NVCL, // NVIDIA OpenCL338 ZigLLVM_NVCL, // NVIDIA OpenCL
...@@ -344,10 +343,12 @@ enum ZigLLVM_OSType {...@@ -344,10 +343,12 @@ enum ZigLLVM_OSType {
344 ZigLLVM_WatchOS, // Apple watchOS343 ZigLLVM_WatchOS, // Apple watchOS
345 ZigLLVM_Mesa3D,344 ZigLLVM_Mesa3D,
346 ZigLLVM_Contiki,345 ZigLLVM_Contiki,
346 ZigLLVM_AMDPAL, // AMD PAL Runtime
347347
348 ZigLLVM_LastOSType = ZigLLVM_Contiki348 ZigLLVM_LastOSType = ZigLLVM_AMDPAL
349};349};
350350
351// Synchronize with target.cpp::environ_list
351enum ZigLLVM_EnvironmentType {352enum ZigLLVM_EnvironmentType {
352 ZigLLVM_UnknownEnvironment,353 ZigLLVM_UnknownEnvironment,
353354
...@@ -368,7 +369,6 @@ enum ZigLLVM_EnvironmentType {...@@ -368,7 +369,6 @@ enum ZigLLVM_EnvironmentType {
368 ZigLLVM_MSVC,369 ZigLLVM_MSVC,
369 ZigLLVM_Itanium,370 ZigLLVM_Itanium,
370 ZigLLVM_Cygnus,371 ZigLLVM_Cygnus,
371 ZigLLVM_AMDOpenCL,
372 ZigLLVM_CoreCLR,372 ZigLLVM_CoreCLR,
373 ZigLLVM_OpenCL,373 ZigLLVM_OpenCL,
374 ZigLLVM_Simulator,374 ZigLLVM_Simulator,