Commit 62668e3e6b3c07d4145a7de3ebb9d5fdd728d75e | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-03-22 15:32:47-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-03-22 15:39:50-04:00
log	62668e3e6b3c07d4145a7de3ebb9d5fdd728d75e
tree	76a96a436af0ed36195f85fcad8e05d31d92440c
parent	53588f4f124bb713cc2c67c721d5f4e3586b7d79

update to llvm 7.0.0

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

README.md
ci
cmake
- Findclang.cmake
- Findllvm.cmake
src

README.md+5-5

...	...	@@ -125,14 +125,14 @@ libc. Create demo games using Zig.
125	125
126	126	* cmake >= 2.8.5
127	127	* 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 above
	128	* LLVM, Clang, LLD development libraries == 7.x, compiled with the same gcc or clang version above
129	129	- These depend on zlib and libxml2.
130	130
131	131	##### Windows
132	132
133	133	* cmake >= 2.8.5
134	134	* Microsoft Visual Studio 2015
135		* LLVM, Clang, LLD development libraries == 6.x, compiled with the same MSVC version above
	135	* LLVM, Clang, LLD development libraries == 7.x, compiled with the same MSVC version above
136	136
137	137	#### Instructions
138	138
...	...	@@ -156,11 +156,11 @@ make install
156	156	`ZIG_LIBC_LIB_DIR` and `ZIG_LIBC_STATIC_LIB_DIR` are unused.
157	157
158	158	```
159		brew install cmake llvm@6
160		brew outdated llvm@6 \|\| brew upgrade llvm@6
	159	brew install cmake llvm@7
	160	brew outdated llvm@7 \|\| brew upgrade llvm@7
161	161	mkdir build
162	162	cd build
163		cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_INSTALL_PREFIX=$(pwd)
	163	cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/ -DCMAKE_INSTALL_PREFIX=$(pwd)
164	164	make install
165	165	./zig build --build-file ../build.zig test
166	166	```

ci/appveyor/appveyor.yml+1-1

...	...	@@ -6,5 +6,5 @@ build_script:
6	6	after_build:
7	7	- '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat'
8	8	cache:
9		- 'llvm+clang-5.0.1-win64-msvc-release.tar.xz'
10	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	7	SET "MSYSTEM=MINGW64"
8	8	SET "APPVEYOR_CACHE_ENTRY_ZIP_ARGS=-m0=Copy"
9	9
10		bash -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 /b
	10	bash -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
11	11
12	12
13	13	SET "PATH=%PREVPATH%"
14	14	SET "MSYSTEM=%PREVMSYSTEM%"
15	15	SET "ZIGBUILDDIR=%APPVEYOR_BUILD_FOLDER%\build-msvc-release"
16		SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-6.0.0-win64-msvc-release"
	16	SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-7.0.0-win64-msvc-release"
17	17
18	18	call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
19	19	call "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	2
3	3	set -x
4	4
5		sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main" >> /etc/apt/sources.list'
	5	sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7.0 main" >> /etc/apt/sources.list'
6	6	wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key\|sudo apt-key add -
7	7	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
8	8	sudo apt-get update -q

ci/travis_linux_install+1-1

...	...	@@ -4,4 +4,4 @@ set -x
4	4
5	5	sudo apt-get remove -y llvm-*
6	6	sudo rm -rf /usr/local/*
7		sudo 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-amd64
	7	sudo 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	3	set -x
4	4	set -e
5	5
6		export CC=clang-6.0
7		export CXX=clang++-6.0
	6	export CC=clang-7.0
	7	export CXX=clang++-7.0
8	8	echo $PATH
9	9	mkdir build
10	10	cd build

ci/travis_osx_install+2-2

...	...	@@ -2,6 +2,6 @@
2	2
3	3	set -x
4	4
5		brew install llvm@6
6		brew outdated llvm@6 \|\| brew upgrade llvm@6
	5	brew install llvm@7
	6	brew outdated llvm@7 \|\| brew upgrade llvm@7
7	7

ci/travis_osx_script+1-1

...	...	@@ -5,7 +5,7 @@ set -e
5	5
6	6	mkdir build
7	7	cd build
8		cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_INSTALL_PREFIX=$(pwd)
	8	cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/ -DCMAKE_INSTALL_PREFIX=$(pwd)
9	9	make VERBOSE=1
10	10	make install
11	11

cmake/Findclang.cmake+4-4

...	...	@@ -27,8 +27,8 @@ if(MSVC)
27	27	else()
28	28	find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
29	29	PATHS
30		/usr/lib/llvm/6/include
31		/usr/lib/llvm-6.0/include
	30	/usr/lib/llvm/7/include
	31	/usr/lib/llvm-7.0/include
32	32	/mingw64/include)
33	33
34	34	macro(FIND_AND_ADD_CLANG_LIB _libname_)
...	...	@@ -36,8 +36,8 @@ else()
36	36	find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
37	37	PATHS
38	38	${CLANG_LIBDIRS}
39		/usr/lib/llvm/6/lib
40		/usr/lib/llvm-6.0/lib
	39	/usr/lib/llvm/7/lib
	40	/usr/lib/llvm-7.0/lib
41	41	/mingw64/lib
42	42	/c/msys64/mingw64/lib
43	43	c:\\msys64\\mingw64\\lib)

cmake/Findllvm.cmake+3-3

...	...	@@ -8,12 +8,12 @@
8	8	# LLVM_LIBDIRS
9	9
10	10	find_program(LLVM_CONFIG_EXE
11		NAMES llvm-config-6.0 llvm-config
	11	NAMES llvm-config-7.0 llvm-config
12	12	PATHS
13	13	"/mingw64/bin"
14	14	"/c/msys64/mingw64/bin"
15	15	"c:/msys64/mingw64/bin"
16		"C:/Libraries/llvm-6.0.0/bin")
	16	"C:/Libraries/llvm-7.0.0/bin")
17	17
18	18	if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug"))
19	19	execute_process(
...	...	@@ -62,7 +62,7 @@ execute_process(
62	62	set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
63	63
64	64	if(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)
66	66	endif()
67	67
68	68	link_directories("${CMAKE_PREFIX_PATH}/lib")

src/target.cpp+7-8

...	...	@@ -148,7 +148,6 @@ static const Os os_list[] = {
148	148	OsRTEMS,
149	149	OsNaCl, // Native Client
150	150	OsCNK, // BG/P Compute-Node Kernel
151		OsBitrig,
152	151	OsAIX,
153	152	OsCUDA, // NVIDIA CUDA
154	153	OsNVCL, // NVIDIA OpenCL
...	...	@@ -159,6 +158,7 @@ static const Os os_list[] = {
159	158	OsWatchOS, // Apple watchOS
160	159	OsMesa3D,
161	160	OsContiki,
	161	OsAMDPAL,
162	162	OsZen,
163	163	};
164	164
...	...	@@ -181,7 +181,6 @@ static const ZigLLVM_EnvironmentType environ_list[] = {
181	181	ZigLLVM_MSVC,
182	182	ZigLLVM_Itanium,
183	183	ZigLLVM_Cygnus,
184		ZigLLVM_AMDOpenCL,
185	184	ZigLLVM_CoreCLR,
186	185	ZigLLVM_OpenCL,
187	186	ZigLLVM_Simulator,
...	...	@@ -280,8 +279,6 @@ static ZigLLVM_OSType get_llvm_os_type(Os os_type) {
280	279	return ZigLLVM_NaCl;
281	280	case OsCNK:
282	281	return ZigLLVM_CNK;
283		case OsBitrig:
284		return ZigLLVM_Bitrig;
285	282	case OsAIX:
286	283	return ZigLLVM_AIX;
287	284	case OsCUDA:
...	...	@@ -302,6 +299,8 @@ static ZigLLVM_OSType get_llvm_os_type(Os os_type) {
302	299	return ZigLLVM_Mesa3D;
303	300	case OsContiki:
304	301	return ZigLLVM_Contiki;
	302	case OsAMDPAL:
	303	return ZigLLVM_AMDPAL;
305	304	}
306	305	zig_unreachable();
307	306	}
...	...	@@ -349,8 +348,6 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
349	348	return OsNaCl;
350	349	case ZigLLVM_CNK:
351	350	return OsCNK;
352		case ZigLLVM_Bitrig:
353		return OsBitrig;
354	351	case ZigLLVM_AIX:
355	352	return OsAIX;
356	353	case ZigLLVM_CUDA:
...	...	@@ -371,6 +368,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
371	368	return OsMesa3D;
372	369	case ZigLLVM_Contiki:
373	370	return OsContiki;
	371	case ZigLLVM_AMDPAL:
	372	return OsAMDPAL;
374	373	}
375	374	zig_unreachable();
376	375	}
...	...	@@ -400,7 +399,6 @@ const char *get_target_os_name(Os os_type) {
400	399	case OsRTEMS:
401	400	case OsNaCl: // Native Client
402	401	case OsCNK: // BG/P Compute-Node Kernel
403		case OsBitrig:
404	402	case OsAIX:
405	403	case OsCUDA: // NVIDIA CUDA
406	404	case OsNVCL: // NVIDIA OpenCL
...	...	@@ -411,6 +409,7 @@ const char *get_target_os_name(Os os_type) {
411	409	case OsWatchOS: // Apple watchOS
412	410	case OsMesa3D:
413	411	case OsContiki:
	412	case OsAMDPAL:
414	413	return ZigLLVMGetOSTypeName(get_llvm_os_type(os_type));
415	414	}
416	415	zig_unreachable();
...	...	@@ -749,7 +748,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
749	748	case OsRTEMS:
750	749	case OsNaCl:
751	750	case OsCNK:
752		case OsBitrig:
753	751	case OsAIX:
754	752	case OsCUDA:
755	753	case OsNVCL:
...	...	@@ -761,6 +759,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
761	759	case OsMesa3D:
762	760	case OsFuchsia:
763	761	case OsContiki:
	762	case OsAMDPAL:
764	763	zig_panic("TODO c type size in bits for this target");
765	764	}
766	765	zig_unreachable();

src/target.hpp+2-1

...	...	@@ -17,6 +17,7 @@ struct ArchType {
17	17	ZigLLVM_SubArchType sub_arch;
18	18	};
19	19
	20	// Synchronize with target.cpp::os_list
20	21	enum Os {
21	22	OsFreestanding,
22	23	OsAnanas,
...	...	@@ -38,7 +39,6 @@ enum Os {
38	39	OsRTEMS,
39	40	OsNaCl, // Native Client
40	41	OsCNK, // BG/P Compute-Node Kernel
41		OsBitrig,
42	42	OsAIX,
43	43	OsCUDA, // NVIDIA CUDA
44	44	OsNVCL, // NVIDIA OpenCL
...	...	@@ -49,6 +49,7 @@ enum Os {
49	49	OsWatchOS, // Apple watchOS
50	50	OsMesa3D,
51	51	OsContiki,
	52	OsAMDPAL,
52	53	OsZen,
53	54	};
54	55

src/zig_llvm.h+3-3

...	...	@@ -333,7 +333,6 @@ enum ZigLLVM_OSType {
333	333	ZigLLVM_RTEMS,
334	334	ZigLLVM_NaCl, // Native Client
335	335	ZigLLVM_CNK, // BG/P Compute-Node Kernel
336		ZigLLVM_Bitrig,
337	336	ZigLLVM_AIX,
338	337	ZigLLVM_CUDA, // NVIDIA CUDA
339	338	ZigLLVM_NVCL, // NVIDIA OpenCL
...	...	@@ -344,10 +343,12 @@ enum ZigLLVM_OSType {
344	343	ZigLLVM_WatchOS, // Apple watchOS
345	344	ZigLLVM_Mesa3D,
346	345	ZigLLVM_Contiki,
	346	ZigLLVM_AMDPAL, // AMD PAL Runtime
347	347
348		ZigLLVM_LastOSType = ZigLLVM_Contiki
	348	ZigLLVM_LastOSType = ZigLLVM_AMDPAL
349	349	};
350	350
	351	// Synchronize with target.cpp::environ_list
351	352	enum ZigLLVM_EnvironmentType {
352	353	ZigLLVM_UnknownEnvironment,
353	354
...	...	@@ -368,7 +369,6 @@ enum ZigLLVM_EnvironmentType {
368	369	ZigLLVM_MSVC,
369	370	ZigLLVM_Itanium,
370	371	ZigLLVM_Cygnus,
371		ZigLLVM_AMDOpenCL,
372	372	ZigLLVM_CoreCLR,
373	373	ZigLLVM_OpenCL,
374	374	ZigLLVM_Simulator,