Commit 78ff2a148a707f041ab5e5cfdbb5f854bc66270e | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-08-15 17:48:37-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-08-15 17:48:37-07:00
log	78ff2a148a707f041ab5e5cfdbb5f854bc66270e
tree	9ecf87dd9df231434d99a21ecafb6ba2f997a881
parent	e9bf8014bd29360353a9bfdff4aa9d5a45bc59f6

cmake: update to LLVM 13 rc1

More precisely, aac4fe380d16a957627af2d6e5110ee35ad7e7e7 which is the
current tip of release/13.x.

Immediately following commits are tracking the same LLVM version.

3 files changed, 62 insertions(+), 62 deletions(-)

cmake

cmake/Findclang.cmake+17-17

...	...	@@ -9,27 +9,27 @@
9	9
10	10	find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
11	11	PATHS
12		/usr/lib/llvm/12/include
13		/usr/lib/llvm-12/include
14		/usr/lib/llvm-12.0/include
15		/usr/local/llvm120/include
16		/usr/local/llvm12/include
	12	/usr/lib/llvm/13/include
	13	/usr/lib/llvm-13/include
	14	/usr/lib/llvm-13.0/include
	15	/usr/local/llvm130/include
	16	/usr/local/llvm13/include
17	17	/mingw64/include
18	18	)
19	19
20	20	if(ZIG_PREFER_CLANG_CPP_DYLIB)
21	21	find_library(CLANG_LIBRARIES
22	22	NAMES
23		clang-cpp-12.0
24		clang-cpp120
	23	clang-cpp-13.0
	24	clang-cpp130
25	25	clang-cpp
26	26	PATHS
27	27	${CLANG_LIBDIRS}
28		/usr/lib/llvm/12/lib
29		/usr/lib/llvm/12/lib64
30		/usr/lib/llvm-12/lib
31		/usr/local/llvm120/lib
32		/usr/local/llvm12/lib
	28	/usr/lib/llvm/13/lib
	29	/usr/lib/llvm/13/lib64
	30	/usr/lib/llvm-13/lib
	31	/usr/local/llvm130/lib
	32	/usr/local/llvm13/lib
33	33	)
34	34	endif()
35	35
...	...	@@ -39,11 +39,11 @@ if(NOT CLANG_LIBRARIES)
39	39	find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
40	40	PATHS
41	41	${CLANG_LIBDIRS}
42		/usr/lib/llvm/12/lib
43		/usr/lib/llvm-12/lib
44		/usr/lib/llvm-12.0/lib
45		/usr/local/llvm120/lib
46		/usr/local/llvm12/lib
	42	/usr/lib/llvm/13/lib
	43	/usr/lib/llvm-13/lib
	44	/usr/lib/llvm-13.0/lib
	45	/usr/local/llvm130/lib
	46	/usr/local/llvm13/lib
47	47	/mingw64/lib
48	48	/c/msys64/mingw64/lib
49	49	c:\\msys64\\mingw64\\lib

cmake/Findlld.cmake+10-10

...	...	@@ -8,16 +8,16 @@
8	8
9	9	find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10	10	PATHS
11		/usr/lib/llvm-12/include
12		/usr/local/llvm120/include
13		/usr/local/llvm12/include
	11	/usr/lib/llvm-13/include
	12	/usr/local/llvm130/include
	13	/usr/local/llvm13/include
14	14	/mingw64/include)
15	15
16		find_library(LLD_LIBRARY NAMES lld-12.0 lld120 lld
	16	find_library(LLD_LIBRARY NAMES lld-13.0 lld130 lld
17	17	PATHS
18		/usr/lib/llvm-12/lib
19		/usr/local/llvm120/lib
20		/usr/local/llvm12/lib
	18	/usr/lib/llvm-13/lib
	19	/usr/local/llvm130/lib
	20	/usr/local/llvm13/lib
21	21	)
22	22	if(EXISTS ${LLD_LIBRARY})
23	23	set(LLD_LIBRARIES ${LLD_LIBRARY})
...	...	@@ -27,9 +27,9 @@ else()
27	27	find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
28	28	PATHS
29	29	${LLD_LIBDIRS}
30		/usr/lib/llvm-12/lib
31		/usr/local/llvm120/lib
32		/usr/local/llvm12/lib
	30	/usr/lib/llvm-13/lib
	31	/usr/local/llvm130/lib
	32	/usr/local/llvm13/lib
33	33	/mingw64/lib
34	34	/c/msys64/mingw64/lib
35	35	c:/msys64/mingw64/lib)

cmake/Findllvm.cmake+35-35

...	...	@@ -9,37 +9,37 @@
9	9
10	10	find_path(LLVM_INCLUDE_DIRS NAMES llvm/IR/IRBuilder.h
11	11	PATHS
12		/usr/lib/llvm/12/include
13		/usr/lib/llvm-12/include
14		/usr/lib/llvm-12.0/include
15		/usr/local/llvm12/include
16		/usr/local/llvm120/include
	12	/usr/lib/llvm/13/include
	13	/usr/lib/llvm-13/include
	14	/usr/lib/llvm-13.0/include
	15	/usr/local/llvm13/include
	16	/usr/local/llvm130/include
17	17	/mingw64/include
18	18	)
19	19
20	20	if(ZIG_PREFER_CLANG_CPP_DYLIB)
21	21	find_library(LLVM_LIBRARIES
22	22	NAMES
23		LLVM-12.0
24		LLVM-12
25		LLVM-120
	23	LLVM-13.0
	24	LLVM-13
	25	LLVM-130
26	26	LLVM
27	27	PATHS
28	28	${LLVM_LIBDIRS}
29		/usr/lib/llvm/12/lib
30		/usr/lib/llvm/12/lib64
31		/usr/lib/llvm-12/lib
32		/usr/local/llvm12/lib
33		/usr/local/llvm120/lib
	29	/usr/lib/llvm/13/lib
	30	/usr/lib/llvm/13/lib64
	31	/usr/lib/llvm-13/lib
	32	/usr/local/llvm13/lib
	33	/usr/local/llvm130/lib
34	34	)
35	35
36	36	find_program(LLVM_CONFIG_EXE
37		NAMES llvm-config-12 llvm-config-12.0 llvm-config120 llvm-config12 llvm-config
	37	NAMES llvm-config-13 llvm-config-13.0 llvm-config130 llvm-config13 llvm-config
38	38	PATHS
39	39	"/mingw64/bin"
40	40	"/c/msys64/mingw64/bin"
41	41	"c:/msys64/mingw64/bin"
42		"C:/Libraries/llvm-12.0.0/bin")
	42	"C:/Libraries/llvm-13.0.0/bin")
43	43
44	44	if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
45	45	message(FATAL_ERROR "unable to find llvm-config")
...	...	@@ -54,23 +54,23 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
54	54	OUTPUT_VARIABLE LLVM_CONFIG_VERSION
55	55	OUTPUT_STRIP_TRAILING_WHITESPACE)
56	56
57		if("${LLVM_CONFIG_VERSION}" VERSION_LESS 12)
58		message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	57	if("${LLVM_CONFIG_VERSION}" VERSION_LESS 13)
	58	message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
59	59	endif()
60		if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 13)
61		message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	60	if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 14)
	61	message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
62	62	endif()
63		if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 13)
64		message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	63	if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 14)
	64	message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
65	65	endif()
66	66	elseif(ZIG_USE_LLVM_CONFIG)
67	67	find_program(LLVM_CONFIG_EXE
68		NAMES llvm-config-12 llvm-config-12.0 llvm-config120 llvm-config12 llvm-config
	68	NAMES llvm-config-13 llvm-config-13.0 llvm-config130 llvm-config13 llvm-config
69	69	PATHS
70	70	"/mingw64/bin"
71	71	"/c/msys64/mingw64/bin"
72	72	"c:/msys64/mingw64/bin"
73		"C:/Libraries/llvm-12.0.0/bin")
	73	"C:/Libraries/llvm-13.0.0/bin")
74	74
75	75	if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
76	76	message(FATAL_ERROR "unable to find llvm-config")
...	...	@@ -85,14 +85,14 @@ elseif(ZIG_USE_LLVM_CONFIG)
85	85	OUTPUT_VARIABLE LLVM_CONFIG_VERSION
86	86	OUTPUT_STRIP_TRAILING_WHITESPACE)
87	87
88		if("${LLVM_CONFIG_VERSION}" VERSION_LESS 12)
89		message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	88	if("${LLVM_CONFIG_VERSION}" VERSION_LESS 13)
	89	message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
90	90	endif()
91		if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 13)
92		message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	91	if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 14)
	92	message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
93	93	endif()
94		if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 13)
95		message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	94	if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 14)
	95	message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
96	96	endif()
97	97
98	98	execute_process(
...	...	@@ -166,7 +166,7 @@ elseif(ZIG_USE_LLVM_CONFIG)
166	166	set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
167	167
168	168	if(NOT LLVM_LIBRARIES)
169		find_library(LLVM_LIBRARIES NAMES LLVM LLVM-12 LLVM-12.0)
	169	find_library(LLVM_LIBRARIES NAMES LLVM LLVM-13 LLVM-13.0)
170	170	endif()
171	171
172	172	link_directories("${CMAKE_PREFIX_PATH}/lib")
...	...	@@ -180,11 +180,11 @@ else()
180	180	find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_}
181	181	PATHS
182	182	${LLVM_LIBDIRS}
183		/usr/lib/llvm/12/lib
184		/usr/lib/llvm-12/lib
185		/usr/lib/llvm-12.0/lib
186		/usr/local/llvm120/lib
187		/usr/local/llvm12/lib
	183	/usr/lib/llvm/13/lib
	184	/usr/lib/llvm-13/lib
	185	/usr/lib/llvm-13.0/lib
	186	/usr/local/llvm130/lib
	187	/usr/local/llvm13/lib
188	188	/mingw64/lib
189	189	/c/msys64/mingw64/lib
190	190	c:\\msys64\\mingw64\\lib)