Skip to content

Commit 9555548

Browse files
vchuravyvchuravy
authored
Merge pull request #42602 from JuliaLang/vc/llvm_13
[LLVM] Upgrade to LLVM 13.0.0
2 parents ba0b7e9 + 4ebca2f commit 9555548

File tree

11 files changed

+286
-342
lines changed

11 files changed

+286
-342
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ else
189189
JL_PRIVATE_LIBS-$(USE_SYSTEM_ZLIB) += libz
190190
endif
191191
ifeq ($(USE_LLVM_SHLIB),1)
192-
JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM libLLVM-12jl
192+
JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM libLLVM-13jl
193193
endif
194194
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUNWIND) += libunwind
195195

‎base/binaryplatforms.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ function detect_cxxstring_abi()
894894
end
895895

896896
function open_libllvm(f::Function)
897-
for lib_name in ("libLLVM", "LLVM", "libLLVMSupport")
897+
for lib_name in ("libLLVM-13jl", "libLLVM", "LLVM", "libLLVMSupport")
898898
hdl = Libdl.dlopen_e(lib_name)
899899
if hdl != C_NULL
900900
try

‎deps/Versions.make

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ CSL_JLL_NAME := CompilerSupportLibraries
1515

1616
# Clang (paired with LLVM, only here as a JLL download)
1717
CLANG_JLL_NAME := Clang
18-
# equivalent to libLLVM 12.0.1+4
19-
CLANG_JLL_VER := 12.0.1+3
18+
CLANG_JLL_VER := 13.0.0+3
2019

2120
# DSFMT
2221
DSFMT_VER := 2.2.4
@@ -45,15 +44,14 @@ LIBUV_VER := 2
4544
LIBUV_JLL_NAME := LibUV
4645

4746
# LLVM
48-
LLVM_VER := 12.0.1
49-
LLVM_ASSERT_JLL_VER := 12.0.1+4
47+
LLVM_VER := 13.0.0
48+
LLVM_ASSERT_JLL_VER := 13.0.0+3
5049
LLVM_JLL_NAME := libLLVM
5150

5251
# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
5352
LLVM_TOOLS_JLL_NAME := LLVM
54-
# equivalent to libLLVM 12.0.1+4
55-
LLVM_TOOLS_JLL_VER := 12.0.1+3
56-
LLVM_TOOLS_ASSERT_JLL_VER := 12.0.1+3
53+
LLVM_TOOLS_JLL_VER := 13.0.0+3
54+
LLVM_TOOLS_ASSERT_JLL_VER := 13.0.0+3
5755

5856
# LLVM libunwind
5957
LLVMUNWIND_VER := 12.0.1

‎deps/checksums/clang

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +0,0 @@
1-
Clang.v12.0.1+3.aarch64-apple-darwin.tar.gz/md5/e48f17625df207526c56dc0010ae0daa
2-
Clang.v12.0.1+3.aarch64-apple-darwin.tar.gz/sha512/e7b9844e84327e8624bb689302f103ad1e621e0e31f2824af54182c597873c38f5e7028ec055aba84645e0c6890c4d39ab2bc9a1acdaa6eaf0b3d648b3e4cdfc
3-
Clang.v12.0.1+3.aarch64-linux-gnu-cxx03.tar.gz/md5/5da291e45739f3cf99c055364bd8c2fd
4-
Clang.v12.0.1+3.aarch64-linux-gnu-cxx03.tar.gz/sha512/6a06c06c6b03d4dbb5fc61d922ce5ff4f394fca2b39025b7e8ee0f50d2373917ad46d8c688f0a6e073a4ad3b14c981a8353d554356d634846be940d659b1da53
5-
Clang.v12.0.1+3.aarch64-linux-gnu-cxx11.tar.gz/md5/e732781718ddbd28567247c5d1ed0d1c
6-
Clang.v12.0.1+3.aarch64-linux-gnu-cxx11.tar.gz/sha512/5b8ee21c0661bd3221252964a1ef0b5be55e227a9d167453be5659bf21d006fcc921b275b35f9ee9c6535fae4e03ee9df585233af61b96d04acf3742997a20b5
7-
Clang.v12.0.1+3.aarch64-linux-musl-cxx03.tar.gz/md5/6d93f705e632a2eef897e56510091bc6
8-
Clang.v12.0.1+3.aarch64-linux-musl-cxx03.tar.gz/sha512/75fa08aeb2c4aafa73e39109391f22c0469df2ef6a5973d7a0f72d9ba9f6602259732ec1d87ec48e019f7c1c7cb168747e1215e7a95b9faf7d12ef4928c2a087
9-
Clang.v12.0.1+3.aarch64-linux-musl-cxx11.tar.gz/md5/92f83227bf548f2237ee367893ea5779
10-
Clang.v12.0.1+3.aarch64-linux-musl-cxx11.tar.gz/sha512/7215208979ca7b6cab569b1d23da554b62d0f09f5ce80b9240a0bdbc55307f2b2cf7dd53523800a620a635d0dc9a5355d0b62b9e943e5e054d527f12e1488283
11-
Clang.v12.0.1+3.armv6l-linux-gnueabihf-cxx03.tar.gz/md5/cb434a7f448a848941150b676a000993
12-
Clang.v12.0.1+3.armv6l-linux-gnueabihf-cxx03.tar.gz/sha512/3c7075e543ca17d7c41d99fb123351fb5afe4b292afe45b2d5283d43b59fe07fe822721455b62dd35ce8eb72c061066eefbb9c72218a0b7cad92fbf0a7f78696
13-
Clang.v12.0.1+3.armv6l-linux-gnueabihf-cxx11.tar.gz/md5/6867cd783ae6e8161f356c2de58b2b9e
14-
Clang.v12.0.1+3.armv6l-linux-gnueabihf-cxx11.tar.gz/sha512/8a976ff74c14b475e4e06ec95b7d24d3e6fc1f8938569c38953314e3ff1be32f03b1aa7f681fcf852cdc4041c2eacbf8ef6110615267dd74c83cbd0e308b0975
15-
Clang.v12.0.1+3.armv6l-linux-musleabihf-cxx03.tar.gz/md5/03d7b293eec65433a10b72fce8822c45
16-
Clang.v12.0.1+3.armv6l-linux-musleabihf-cxx03.tar.gz/sha512/9a2b00fe099c6481122252f2079692335bdc450b67ac094272725bf992d9376a55102db8221ad56e1575c75af09fbc5919f06faea63130785973afdadd7d5920
17-
Clang.v12.0.1+3.armv6l-linux-musleabihf-cxx11.tar.gz/md5/a7c9d6bfc7d6f203b50f9b4dcecd6965
18-
Clang.v12.0.1+3.armv6l-linux-musleabihf-cxx11.tar.gz/sha512/0532eeb0c391927c897d7c050913d5b41d0869bb26da2e56d782e60b228fef859bc1928e563f4ee349d4bad450588e7706a144398ca47a849ca2c36b7721fa8d
19-
Clang.v12.0.1+3.armv7l-linux-gnueabihf-cxx03.tar.gz/md5/5cda8cbfc60a39c7e4426c0f12545337
20-
Clang.v12.0.1+3.armv7l-linux-gnueabihf-cxx03.tar.gz/sha512/ea35242499d3e658c72407e3caa42a642051d6a0245aa72605288b9c5f90335d3caf2c2f2c31768e1667fccaf3e6f3e6d003b98504aec4304f562ee6854cf434
21-
Clang.v12.0.1+3.armv7l-linux-gnueabihf-cxx11.tar.gz/md5/460de1a7571da00e77ab43488cc5c81a
22-
Clang.v12.0.1+3.armv7l-linux-gnueabihf-cxx11.tar.gz/sha512/e275ef8b01b142e8187dfc5420342fc6d889ce97458d4178f85b7951a37e37896d3d30793856475030d635d6df7fc20a380524ef24560d4d3a1681564135517e
23-
Clang.v12.0.1+3.armv7l-linux-musleabihf-cxx03.tar.gz/md5/42b35ff028d6c4964083ac6218d783e6
24-
Clang.v12.0.1+3.armv7l-linux-musleabihf-cxx03.tar.gz/sha512/d941f82bff7917d8c8b9b260a8896d1af8d61c56dcc574e7a96a3971da8622f2d5822e340f8d5cf340adcc36760a757efa68c7e6a4686ecdec49207b68761ea0
25-
Clang.v12.0.1+3.armv7l-linux-musleabihf-cxx11.tar.gz/md5/2fffd7d0d994b8185b6b93e43ba0d187
26-
Clang.v12.0.1+3.armv7l-linux-musleabihf-cxx11.tar.gz/sha512/d538b96f66e9d4935391abd51ed069a323c7dde561ab5daafbc31360c422a25fffcf924a676d50642275c3047cc2c733b89a9c130f78fa9862a63146d981ae0f
27-
Clang.v12.0.1+3.i686-linux-gnu-cxx03.tar.gz/md5/cd41e8189cb89991cf25b2d29418b127
28-
Clang.v12.0.1+3.i686-linux-gnu-cxx03.tar.gz/sha512/8c42ce277a94492e76c7719cc7aa9388fc167caa05bec7faec901dfaae953857c97a82c24edfa47d42e23bda3ccb13e6ef33b89d5e663177429b95304d74f6ba
29-
Clang.v12.0.1+3.i686-linux-gnu-cxx11.tar.gz/md5/39e81ef66d081d99e63c3df56392f518
30-
Clang.v12.0.1+3.i686-linux-gnu-cxx11.tar.gz/sha512/fe630a179fe59fa899bab114890b3e3f8d704b08eca933289f26ac888fff2dce295328b75c77c0a837890d0ef15a07e92df30a60c71e3db5be99b4dbc8e3bbe1
31-
Clang.v12.0.1+3.i686-linux-musl-cxx03.tar.gz/md5/db4f1a883aff089f3e939ea73019ce92
32-
Clang.v12.0.1+3.i686-linux-musl-cxx03.tar.gz/sha512/4dafc8b917a4fbfa07477d6fd95b08c14ad3a5101017e539ca6b09c572a671117f30336f705a1a494ea123b5afdfd84ae3e4d3e18d7179225fd20873e758be27
33-
Clang.v12.0.1+3.i686-linux-musl-cxx11.tar.gz/md5/f06fdcc12560bfa49659fd074d7c3e85
34-
Clang.v12.0.1+3.i686-linux-musl-cxx11.tar.gz/sha512/5f5b70b2f52752a255ada165408adab30f5c3549a9a0c07ab02efa86af437610eb948309cf7c62282edbf0f19b6c72ef011c276405b9c80207775211a15409b9
35-
Clang.v12.0.1+3.i686-w64-mingw32-cxx03.tar.gz/md5/a45b6e1a73bfe6c89e42e02fb0a7c8d5
36-
Clang.v12.0.1+3.i686-w64-mingw32-cxx03.tar.gz/sha512/d0a8a539e2ae9ae0c652e80c2a321b2ea5e1e0d2b7d50850ef9fb2013b5b1ee8dda86e159b17aba9e5c4fa35d777dd6cf99e10bd54fbd51d9a2e235486e70956
37-
Clang.v12.0.1+3.i686-w64-mingw32-cxx11.tar.gz/md5/0cf24f2a471eaa7979f8b08dbc6384df
38-
Clang.v12.0.1+3.i686-w64-mingw32-cxx11.tar.gz/sha512/3cb5d20140c3e10a079e603377e5963844a85c6c50f3df7ec7981a16c0c2b7810cbab3460be9b96412ee9cfc6664d6d2dfefc554101a2b8934b4fc8551a90ece
39-
Clang.v12.0.1+3.powerpc64le-linux-gnu-cxx03.tar.gz/md5/01c8ca0f75ca27893933b0f56dc2e4f7
40-
Clang.v12.0.1+3.powerpc64le-linux-gnu-cxx03.tar.gz/sha512/c00bd0c1ec5a602c2343865ba3267904b24daa92bcd384240d7f09190dfaaa9ec7d1927c60245345a9b207224ac15834332406f67a0ba152239c4064f38800de
41-
Clang.v12.0.1+3.powerpc64le-linux-gnu-cxx11.tar.gz/md5/901196acf617f5e7113197b9f555e357
42-
Clang.v12.0.1+3.powerpc64le-linux-gnu-cxx11.tar.gz/sha512/efab074365fa8597fe3c383d69cad981edebe9919128c9de01801cfc2e77e83c070fad61cc606670045af696b00f724f1b4fd9166d54090984a587b4c3c193db
43-
Clang.v12.0.1+3.x86_64-apple-darwin.tar.gz/md5/ce31160483e0a9872391988530012ee9
44-
Clang.v12.0.1+3.x86_64-apple-darwin.tar.gz/sha512/a091f580ed8ffec36aecb5b7b929b0c4753ecce2f0a4421fe99a8b98d1e615bb975ffe1a82acc3921eac8a2e92055012c8222c7b8a52214acc87e2d8b0b16fb4
45-
Clang.v12.0.1+3.x86_64-linux-gnu-cxx03.tar.gz/md5/ad4f1b6309c845816fe20b974e02acf1
46-
Clang.v12.0.1+3.x86_64-linux-gnu-cxx03.tar.gz/sha512/9a6b18091bdf586c554fd9c4c0a97da2324e69443ebc732d4863028f099ea0523c1ac476726b6310ef95f438673d317170cba38e571a5de16805b43d9b6fa64c
47-
Clang.v12.0.1+3.x86_64-linux-gnu-cxx11.tar.gz/md5/3cf260c1df00939fdaf322320b19264b
48-
Clang.v12.0.1+3.x86_64-linux-gnu-cxx11.tar.gz/sha512/15951398a9d2c176caee370e004234e7db7eda5d590b74183ee5696678b4bb8ecad6047cdd4cb7c62f25847035b0e52d4c8ee8cb25d08e0edf00a68dbee12e98
49-
Clang.v12.0.1+3.x86_64-linux-musl-cxx03.tar.gz/md5/ce07838922efed663d6aea0ee0b0995e
50-
Clang.v12.0.1+3.x86_64-linux-musl-cxx03.tar.gz/sha512/e05a903feda1868d17b311816943f00745ce79fc859ed92782b8606c11015f13884380ddc5fa6e1fad2174b2f5f32ec3208eb76e000ffc9825ff532926ff8859
51-
Clang.v12.0.1+3.x86_64-linux-musl-cxx11.tar.gz/md5/a59f567abcc0adbed004ba0d0e590407
52-
Clang.v12.0.1+3.x86_64-linux-musl-cxx11.tar.gz/sha512/45e6f46f028beb879f9fec18137593882a7d81fc0825b623d9884f9b8fa400ca847e0c975ad2a7f1fce6ab7bee6d2f7d3cd3c6ad4ee49cbf879584ea7b3e2e58
53-
Clang.v12.0.1+3.x86_64-unknown-freebsd.tar.gz/md5/5caa4b65706d5bcce71e72ac8dae39bc
54-
Clang.v12.0.1+3.x86_64-unknown-freebsd.tar.gz/sha512/d49041ff192b1af43778afed30d0ab8f8e6a6b0cf1a8b0382712dd54e0362de2a58a9ea69ef51a1924f34480a79bb6a498904fb7eecb76e6cb40bffc98427093
55-
Clang.v12.0.1+3.x86_64-w64-mingw32-cxx03.tar.gz/md5/88e8ce154a83ac41fa8bdee270453f54
56-
Clang.v12.0.1+3.x86_64-w64-mingw32-cxx03.tar.gz/sha512/d9087edb3ee10bb91783340f27717a690a7e659aeb7bbff138f1a9ce1db2763c9f3cabd8cb0a1d1c79e2587a993ca609d815166db009b214689c7d4f1c55f05c
57-
Clang.v12.0.1+3.x86_64-w64-mingw32-cxx11.tar.gz/md5/1394c306638fe127292414f6144e6d90
58-
Clang.v12.0.1+3.x86_64-w64-mingw32-cxx11.tar.gz/sha512/88f6aa01c851cb26f8999d4a1996527351237fd3331048b4255de303c3cd8e8e90ba217bbf709bc1277e9eab46258b831d0bdaccdcc58dbf086b8be0a1ae49d0

0 commit comments

Comments
 (0)