Skip to content

Commit 5a3ea9b

Browse files
committed
Merge remote-tracking branch 'origin/llvm12'
Happy LLVM 12 Release Day. Please note that the llvm 12 tag does not include the latest commit in the release/12.x branch, which is in fact a bug fix for a regression that is causing a failure in Zig's test suite. Zig master branch is tracking release/12.x, and will be enabling the test that is fixed by that commit.
2 parents 1fada37 + cc186da commit 5a3ea9b

File tree

252 files changed

+24159
-14773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+24159
-14773
lines changed

cmake/Findclang.cmake

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99

1010
find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
1111
PATHS
12-
/usr/lib/llvm/11/include
13-
/usr/lib/llvm-11/include
14-
/usr/lib/llvm-11.0/include
15-
/usr/local/llvm110/include
16-
/usr/local/llvm11/include
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
1717
/mingw64/include
1818
)
1919

2020
if(ZIG_PREFER_CLANG_CPP_DYLIB)
2121
find_library(CLANG_LIBRARIES
2222
NAMES
23-
clang-cpp-11.0
24-
clang-cpp110
23+
clang-cpp-12.0
24+
clang-cpp120
2525
clang-cpp
2626
PATHS
2727
${CLANG_LIBDIRS}
28-
/usr/lib/llvm/11/lib
29-
/usr/lib/llvm/11/lib64
30-
/usr/lib/llvm-11/lib
31-
/usr/local/llvm110/lib
32-
/usr/local/llvm11/lib
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
3333
)
3434
endif()
3535

@@ -39,11 +39,11 @@ if(NOT CLANG_LIBRARIES)
3939
find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
4040
PATHS
4141
${CLANG_LIBDIRS}
42-
/usr/lib/llvm/11/lib
43-
/usr/lib/llvm-11/lib
44-
/usr/lib/llvm-11.0/lib
45-
/usr/local/llvm110/lib
46-
/usr/local/llvm11/lib
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
4747
/mingw64/lib
4848
/c/msys64/mingw64/lib
4949
c:\\msys64\\mingw64\\lib

cmake/Findlld.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
1010
PATHS
11-
/usr/lib/llvm-11/include
12-
/usr/local/llvm110/include
13-
/usr/local/llvm11/include
11+
/usr/lib/llvm-12/include
12+
/usr/local/llvm120/include
13+
/usr/local/llvm12/include
1414
/mingw64/include)
1515

16-
find_library(LLD_LIBRARY NAMES lld-11.0 lld110 lld
16+
find_library(LLD_LIBRARY NAMES lld-12.0 lld120 lld
1717
PATHS
18-
/usr/lib/llvm-11/lib
19-
/usr/local/llvm110/lib
20-
/usr/local/llvm11/lib
18+
/usr/lib/llvm-12/lib
19+
/usr/local/llvm120/lib
20+
/usr/local/llvm12/lib
2121
)
2222
if(EXISTS ${LLD_LIBRARY})
2323
set(LLD_LIBRARIES ${LLD_LIBRARY})
@@ -27,9 +27,9 @@ else()
2727
find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
2828
PATHS
2929
${LLD_LIBDIRS}
30-
/usr/lib/llvm-11/lib
31-
/usr/local/llvm110/lib
32-
/usr/local/llvm11/lib
30+
/usr/lib/llvm-12/lib
31+
/usr/local/llvm120/lib
32+
/usr/local/llvm12/lib
3333
/mingw64/lib
3434
/c/msys64/mingw64/lib
3535
c:/msys64/mingw64/lib)

0 commit comments

Comments
 (0)