Skip to content

Commit df1a8bc

Browse files
committed
Update for clang 19
1 parent 71181dd commit df1a8bc

7 files changed

Lines changed: 8 additions & 13 deletions

File tree

Knitfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if cli.cmake_build_type then
1515
configure_flags = configure_flags .. "-DCMAKE_BUILD_TYPE=" .. cli.cmake_build_type
1616
end
1717

18-
local llvm_include="build/llvm-project/llvm/lib/clang/18/include/"
18+
local llvm_include="build/llvm-project/llvm/lib/clang/19/include/"
1919

2020
rules = b{}
2121
for _, step in pairs(fix_steps) do

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ for task in ${Tasks}; do
5454
do
5555
if test -f "${OUTPUT}"/"${task}"/function"${i}".c; then
5656

57-
"${SRC}"/build/src/sys-driver/c-to-elf-sys "${OUTPUT}"/"${task}"/function"${i}".c "${OUTPUT}"/"${task}"/function-impl.h "${OUTPUT}"/"${task}"/function.h "${SRC}"/build/llvm-project/llvm/lib/clang/18/include/ "${OUTPUT}"/"${task}"/function"${i}".o &
57+
"${SRC}"/build/src/sys-driver/c-to-elf-sys "${OUTPUT}"/"${task}"/function"${i}".c "${OUTPUT}"/"${task}"/function-impl.h "${OUTPUT}"/"${task}"/function.h "${SRC}"/build/llvm-project/llvm/lib/clang/19/include/ "${OUTPUT}"/"${task}"/function"${i}".o &
5858
running=$(jobs -r | wc -l)
5959
if [ "$running" -ge $(("$PARALLEL"-1)) ]
6060
then

fix

Submodule fix updated 58 files

serialize.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ mkdir -p ${FIX}/relations
99
mkdir -p ${FIX}/labels
1010
mkdir -p ${FIX}/pins
1111

12-
${SRC}/build/src/serialize/serialize ${SRC}/ ${SRC}/build/llvm-project/llvm/lib/clang/18/include/
12+
${SRC}/build/src/serialize/serialize ${SRC}/ ${SRC}/build/llvm-project/llvm/lib/clang/19/include/

src/clang/cc1args.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ const char* cc1args[] = { "-ferror-limit",
1414
"-tune-cpu",
1515
"znver2",
1616
"-target-feature",
17-
"-avx512pf",
18-
"-target-feature",
1917
"-tsxldtrk",
2018
"-target-feature",
2119
"+cx16",
@@ -62,8 +60,6 @@ const char* cc1args[] = { "-ferror-limit",
6260
"-target-feature",
6361
"+xsaves",
6462
"-target-feature",
65-
"-avx512er",
66-
"-target-feature",
6763
"-avxvnni",
6864
"-target-feature",
6965
"-avx512fp16",
@@ -160,8 +156,6 @@ const char* cc1args[] = { "-ferror-limit",
160156
"-target-feature",
161157
"+pclmul",
162158
"-target-feature",
163-
"-prefetchwt1",
164-
"-target-feature",
165159
"+f16c",
166160
"-target-feature",
167161
"+ssse3",

src/clang/depfile.hh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ static const std::vector<const char*> system_deps
6868

6969
static const std::vector<const char*> clang_deps
7070
= { "/usr/lib/llvm-16/lib/clang/16.0.0/include/immintrin.h",
71+
"/usr/lib/llvm-16/lib/clang/16.0.0/include/adcintrin.h",
7172
"/usr/lib/llvm-16/lib/clang/16.0.0/include/x86gprintrin.h",
7273
"/usr/lib/llvm-16/lib/clang/16.0.0/include/usermsrintrin.h",
7374
"/usr/lib/llvm-16/lib/clang/16.0.0/include/hresetintrin.h",
@@ -84,6 +85,7 @@ static const std::vector<const char*> clang_deps
8485
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg_va_copy.h",
8586
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg_va_list.h",
8687
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg___gnuc_va_list.h",
88+
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stdarg_header_macro.h",
8789
"/usr/lib/llvm-16/lib/clang/16.0.0/include/stddef.h",
8890
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_max_align_t.h",
8991
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_ptrdiff_t.h",
@@ -96,6 +98,7 @@ static const std::vector<const char*> clang_deps
9698
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_max_align_t.h",
9799
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_offsetof.h",
98100
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_wint_t.h",
101+
"/usr/lib/llvm-16/lib/clang/16.0.0/include/__stddef_header_macro.h",
99102
"/usr/lib/llvm-16/lib/clang/16.0.0/include/emmintrin.h",
100103
"/usr/lib/llvm-16/lib/clang/16.0.0/include/pmmintrin.h",
101104
"/usr/lib/llvm-16/lib/clang/16.0.0/include/tmmintrin.h",
@@ -128,15 +131,13 @@ static const std::vector<const char*> clang_deps
128131
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlbwintrin.h",
129132
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlcdintrin.h",
130133
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vldqintrin.h",
131-
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512erintrin.h",
132134
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512ifmaintrin.h",
133135
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512ifmavlintrin.h",
134136
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avxifmaintrin.h",
135137
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vbmiintrin.h",
136138
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vbmivlintrin.h",
137139
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vbmi2intrin.h",
138140
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlvbmi2intrin.h",
139-
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512pfintrin.h",
140141
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512fp16intrin.h",
141142
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512vlfp16intrin.h",
142143
"/usr/lib/llvm-16/lib/clang/16.0.0/include/avx512bf16intrin.h",

src/fix-driver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_link_options(-nostdlib -Wl,--no-entry -Wl,--allow-undefined)
22
set(LIBS $ENV{HOME}/wasm-toolchain/sysroot/lib/wasm32-wasi/libc++.a
33
$ENV{HOME}/wasm-toolchain/sysroot/lib/wasm32-wasi/libc++abi.a
44
$ENV{HOME}/wasm-toolchain/sysroot/lib/wasm32-wasi/libc.a
5-
$ENV{HOME}/wasm-toolchain/sysroot/lib/clang/18/lib/wasi/libclang_rt.builtins-wasm32.a)
5+
$ENV{HOME}/wasm-toolchain/sysroot/lib/clang/19/lib/wasi/libclang_rt.builtins-wasm32.a)
66

77
add_library(stub-obj OBJECT "stubs.c")
88

0 commit comments

Comments
 (0)