Skip to content

Commit edf2de2

Browse files
mcbartonmcbarton
committed
Upgrade to support llvm 20
1 parent 490dfcb commit edf2de2

File tree

7 files changed

+101
-7
lines changed

7 files changed

+101
-7
lines changed

‎.github/workflows/MacOS-arm.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
include:
25+
- name: osx15-arm-clang-clang-repl-20
26+
os: macos-15
27+
compiler: clang
28+
clang-runtime: '20'
29+
cling: Off
30+
llvm_enable_projects: "clang"
31+
llvm_targets_to_build: "host"
2532
- name: osx15-arm-clang-clang-repl-19
2633
os: macos-15
2734
compiler: clang
@@ -251,6 +258,12 @@ jobs:
251258
fail-fast: false
252259
matrix:
253260
include:
261+
- name: osx15-arm-clang-clang-repl-20
262+
os: macos-15
263+
compiler: clang
264+
clang-runtime: '20'
265+
cling: Off
266+
cppyy: Off
254267
- name: osx15-arm-clang-clang-repl-19-cppyy
255268
os: macos-15
256269
compiler: clang

‎.github/workflows/MacOS.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
include:
25+
- name: osx13-x86-clang-clang-repl-20
26+
os: macos-13
27+
compiler: clang
28+
clang-runtime: '20'
29+
cling: Off
30+
llvm_enable_projects: "clang"
31+
llvm_targets_to_build: "host"
2532
- name: osx13-x86-clang-clang-repl-19
2633
os: macos-13
2734
compiler: clang
@@ -236,6 +243,12 @@ jobs:
236243
fail-fast: false
237244
matrix:
238245
include:
246+
- name: osx13-x86-clang-clang-repl-20
247+
os: macos-13
248+
compiler: clang
249+
clang-runtime: '20'
250+
cling: Off
251+
cppyy: Off
239252
- name: osx13-x86-clang-clang-repl-19-cppyy
240253
os: macos-13
241254
compiler: clang

‎.github/workflows/Ubuntu-arm.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
include:
25+
- name: ubu22-arm-gcc12-clang-repl-20
26+
os: ubuntu-22.04-arm
27+
compiler: gcc-12
28+
clang-runtime: '20'
29+
cling: Off
30+
llvm_enable_projects: "clang"
31+
llvm_targets_to_build: "host;NVPTX"
2532
- name: ubu22-arm-gcc12-clang-repl-19
2633
os: ubuntu-22.04-arm
2734
compiler: gcc-12
@@ -58,6 +65,13 @@ jobs:
5865
cling-version: '1.0'
5966
llvm_enable_projects: "clang"
6067
llvm_targets_to_build: "host;NVPTX"
68+
- name: ubu24-arm-gcc12-clang-repl-20
69+
os: ubuntu-24.04-arm
70+
compiler: gcc-12
71+
clang-runtime: '20'
72+
cling: Off
73+
llvm_enable_projects: "clang"
74+
llvm_targets_to_build: "host;NVPTX"
6175
- name: ubu24-arm-gcc12-clang-repl-19
6276
os: ubuntu-24.04-arm
6377
compiler: gcc-12
@@ -275,6 +289,12 @@ jobs:
275289
fail-fast: false
276290
matrix:
277291
include:
292+
- name: ubu22-arm-gcc12-clang-repl-20
293+
os: ubuntu-22.04-arm
294+
compiler: gcc-12
295+
clang-runtime: '20'
296+
cling: Off
297+
cppyy: Off
278298
- name: ubu22-arm-gcc12-clang-repl-19-cppyy
279299
os: ubuntu-22.04-arm
280300
compiler: gcc-12
@@ -306,6 +326,12 @@ jobs:
306326
cling: On
307327
cling-version: '1.0'
308328
cppyy: On
329+
- name: ubu24-arm-gcc12-clang-repl-20
330+
os: ubuntu-24.04-arm
331+
compiler: gcc-12
332+
clang-runtime: '20'
333+
cling: Off
334+
cppyy: Off
309335
- name: ubu24-arm-gcc12-clang-repl-19-cppyy
310336
os: ubuntu-24.04-arm
311337
compiler: gcc-12

‎.github/workflows/Ubuntu.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
include:
25+
- name: ubu22-x86-gcc12-clang-repl-20
26+
os: ubuntu-22.04
27+
compiler: gcc-12
28+
clang-runtime: '20'
29+
cling: Off
30+
llvm_enable_projects: "clang"
31+
llvm_targets_to_build: "host;NVPTX"
2532
- name: ubu22-x86-gcc12-clang-repl-19
2633
os: ubuntu-22.04
2734
compiler: gcc-12
@@ -58,6 +65,13 @@ jobs:
5865
cling-version: '1.0'
5966
llvm_enable_projects: "clang"
6067
llvm_targets_to_build: "host;NVPTX"
68+
- name: ubu24-x86-gcc12-clang-repl-20
69+
os: ubuntu-24.04
70+
compiler: gcc-12
71+
clang-runtime: '20'
72+
cling: Off
73+
llvm_enable_projects: "clang"
74+
llvm_targets_to_build: "host;NVPTX"
6175
- name: ubu24-x86-gcc12-clang-repl-19
6276
os: ubuntu-24.04
6377
compiler: gcc-12
@@ -275,6 +289,12 @@ jobs:
275289
fail-fast: false
276290
matrix:
277291
include:
292+
- name: ubu22-x86-gcc12-clang-repl-20
293+
os: ubuntu-22.04
294+
compiler: gcc-12
295+
clang-runtime: '20'
296+
cling: Off
297+
cppyy: Off
278298
- name: ubu22-x86-gcc12-clang-repl-19-docs
279299
os: ubuntu-22.04
280300
compiler: gcc-12
@@ -314,6 +334,12 @@ jobs:
314334
cling: On
315335
cling-version: '1.0'
316336
cppyy: On
337+
- name: ubu24-x86-gcc12-clang-repl-20
338+
os: ubuntu-24.04
339+
compiler: gcc-12
340+
clang-runtime: '20'
341+
cling: Off
342+
cppyy: Off
317343
- name: ubu24-x86-gcc12-clang-repl-19-cppyy
318344
os: ubuntu-24.04
319345
compiler: gcc-12

‎.github/workflows/Windows.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24+
- name: win2025-msvc-clang-repl-20
25+
os: windows-2025
26+
compiler: msvc
27+
clang-runtime: '20'
28+
cling: Off
29+
llvm_enable_projects: "clang"
30+
llvm_targets_to_build: "host;NVPTX"
2431
- name: win2025-msvc-clang-repl-19
2532
os: windows-2025
2633
compiler: msvc
@@ -224,6 +231,12 @@ jobs:
224231
fail-fast: false
225232
matrix:
226233
include:
234+
- name: win2025-msvc-clang-repl-20
235+
os: windows-2025
236+
compiler: msvc
237+
clang-runtime: '20'
238+
cling: Off
239+
cppyy: Off
227240
- name: win2025-msvc-clang-repl-19
228241
os: windows-2025
229242
compiler: msvc

‎CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ include(GNUInstallDirs)
6767
## Define supported version of clang and llvm
6868

6969
set(CLANG_MIN_SUPPORTED 13.0)
70-
set(CLANG_MAX_SUPPORTED "19.1.x")
71-
set(CLANG_VERSION_UPPER_BOUND 20.0.0)
70+
set(CLANG_MAX_SUPPORTED "20.1.x")
71+
set(CLANG_VERSION_UPPER_BOUND 21.0.0)
7272
set(LLD_MIN_SUPPORTED 13.0)
73-
set(LLD_MAX_SUPPORTED "19.1.x")
74-
set(LLD_VERSION_UPPER_BOUND 20.0.0)
73+
set(LLD_MAX_SUPPORTED "20.1.x")
74+
set(LLD_VERSION_UPPER_BOUND 21.0.0)
7575
set(LLVM_MIN_SUPPORTED 13.0)
76-
set(LLVM_MAX_SUPPORTED "19.1.x")
77-
set(LLVM_VERSION_UPPER_BOUND 20.0.0)
76+
set(LLVM_MAX_SUPPORTED "20.1.x")
77+
set(LLVM_VERSION_UPPER_BOUND 21.0.0)
7878

7979
## Set Cmake packages search order
8080

‎lib/Interpreter/Paths.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,15 @@ void CopyIncludePaths(const clang::HeaderSearchOptions& Opts,
174174
if (!withSystem) continue;
175175
if (withFlags) incpaths.push_back("-isystem");
176176
break;
177-
177+
// option doesn't appear to exist for llvm>19. Will revert if I determine
178+
// otherwise.
179+
#if CLANG_VERSION_MAJOR < 20
178180
case frontend::IndexHeaderMap:
179181
if (!withSystem) continue;
180182
if (withFlags) incpaths.push_back("-index-header-map");
181183
if (withFlags) incpaths.push_back(E.IsFramework? "-F" : "-I");
182184
break;
185+
#endif
183186

184187
case frontend::CSystem:
185188
if (!withSystem) continue;

0 commit comments

Comments
 (0)