Update CI

wasix-org · Jan 13, 2025 · 4dd57a3 · 4dd57a3
1 parent 3abf08e
commit 4dd57a3
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 28 deletions.
diff --git a/.github/workflows/build_cxx_sysroot.yml b/.github/workflows/build_cxx_sysroot.yml
@@ -21,12 +21,7 @@ jobs:
       - name: Update and install dependencies
         run: |
           pacman -Syu --noconfirm
-          pacman -Sy --noconfirm coreutils nodejs npm wget git cmake ninja llvm14 clang14 rsync make lld wasmer cargo python3
-          ln -s /usr/lib/llvm14/bin/clang-14 /usr/bin/clang
-          ln -s /usr/lib/llvm14/bin/clang++ /usr/bin/clang++
-          ln -s /usr/bin/llvm-ar-14 /usr/bin/llvm-ar
-          ln -s /usr/bin/llvm-nm-14 /usr/bin/llvm-nm
-          ln -s /usr/bin/llvm-ranlib-14 /usr/bin/llvm-ranlib
+          pacman -Sy --noconfirm coreutils nodejs npm wget git cmake ninja llvm clang rsync make lld wasmer cargo python3
 
       - name: Log tool versions
         run: |
@@ -84,8 +79,8 @@ jobs:
         run: |
           export CLANG_VERSION=$(clang --version | grep -i "clang version" | sed -n 's/.*version \([0-9.]*\).*/\1/p')
           echo Detected clang version $CLANG_VERSION
-          mkdir -p /usr/lib/llvm14/lib/clang/$CLANG_VERSION/lib/wasi 
-          cp /opt/wasix-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a /usr/lib/llvm14/lib/clang/$CLANG_VERSION/lib/wasi/libclang_rt.builtins-wasm32.a
+          mkdir -p /usr/lib/clang/19/lib/wasm32-wasmer-wasi 
+          cp /opt/wasix-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a /usr/lib/clang/19/lib/wasm32-wasmer-wasi/libclang_rt.builtins.a
           TOOLCHAIN=/opt/wasix-sysroot/clang-wasix.cmake_toolchain ./test/wasix/run_tests.sh
 
       - name: Upload sysroot
@@ -103,12 +98,7 @@ jobs:
       - name: Update and install dependencies
         run: |
           pacman -Syu --noconfirm
-          pacman -Sy --noconfirm coreutils nodejs npm wget git cmake ninja llvm14 clang14 rsync make lld wasmer cargo python3
-          ln -s /usr/lib/llvm14/bin/clang-14 /usr/bin/clang
-          ln -s /usr/lib/llvm14/bin/clang++ /usr/bin/clang++
-          ln -s /usr/bin/llvm-ar-14 /usr/bin/llvm-ar
-          ln -s /usr/bin/llvm-nm-14 /usr/bin/llvm-nm
-          ln -s /usr/bin/llvm-ranlib-14 /usr/bin/llvm-ranlib
+          pacman -Sy --noconfirm coreutils nodejs npm wget git cmake ninja llvm clang rsync make lld wasmer cargo python3
 
       - name: Log tool versions
         run: |
@@ -166,8 +156,8 @@ jobs:
         run: |
           export CLANG_VERSION=$(clang --version | grep -i "clang version" | sed -n 's/.*version \([0-9.]*\).*/\1/p')
           echo Detected clang version $CLANG_VERSION
-          mkdir -p /usr/lib/llvm14/lib/clang/$CLANG_VERSION/lib/wasi 
-          cp /opt/wasix-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a /usr/lib/llvm14/lib/clang/$CLANG_VERSION/lib/wasi/libclang_rt.builtins-wasm32.a
+          mkdir -p /usr/lib/clang/19/lib/wasm32-wasmer-wasi 
+          cp /opt/wasix-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a /usr/lib/clang/19/lib/wasm32-wasmer-wasi/libclang_rt.builtins.a
           TOOLCHAIN=/opt/wasix-sysroot/clang-wasix.cmake_toolchain ./test/wasix/run_tests.sh
 
       - name: Upload sysroot

diff --git a/build32-eh.sh b/build32-eh.sh
@@ -60,6 +60,7 @@ cmake \
     -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
     -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
     -DLIBCXXABI_ENABLE_PIC:BOOL=OFF \
+    -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
     -DCMAKE_C_COMPILER_WORKS=ON \
     -DCMAKE_CXX_COMPILER_WORKS=ON \
     -DLLVM_COMPILER_CHECKED=ON \

diff --git a/build32.sh b/build32.sh
@@ -60,6 +60,7 @@ cmake \
     -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
     -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
     -DLIBCXXABI_ENABLE_PIC:BOOL=OFF \
+    -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
     -DCMAKE_C_COMPILER_WORKS=ON \
     -DCMAKE_CXX_COMPILER_WORKS=ON \
     -DLLVM_COMPILER_CHECKED=ON \

diff --git a/expected/wasm32-wasi-eh/defined-symbols.txt b/expected/wasm32-wasi-eh/defined-symbols.txt
@@ -440,7 +440,6 @@ __wasi_proc_parent
 __wasi_proc_raise
 __wasi_proc_raise_interval
 __wasi_proc_signal
-__wasi_proc_snapshot
 __wasi_proc_spawn
 __wasi_random_get
 __wasi_resolve
@@ -1718,7 +1717,6 @@ wait3
 wait4
 waitpid
 wasi_thread_start
-wasix_proc_snapshot
 wcpcpy
 wcpncpy
 wcrtomb

diff --git a/expected/wasm32-wasi-eh/predefined-macros.txt b/expected/wasm32-wasi-eh/predefined-macros.txt
@@ -6520,10 +6520,8 @@
 #define __wasm__ 1
 #define __wasm_atomics__ 1
 #define __wasm_bulk_memory__ 1
-#define __wasm_bulk_memory_opt__ 1
 #define __wasm_exception_handling__ 1
 #define __wasm_multivalue__ 1
-#define __wasm_nontrapping_fptoint__ 1
 #define __wasm_reference_types__ 1
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)

diff --git a/expected/wasm32-wasi-eh/undefined-symbols.txt b/expected/wasm32-wasi-eh/undefined-symbols.txt
@@ -94,7 +94,6 @@ __imported_wasix_32v1_proc_join
 __imported_wasix_32v1_proc_parent
 __imported_wasix_32v1_proc_raise_interval
 __imported_wasix_32v1_proc_signal
-__imported_wasix_32v1_proc_snapshot
 __imported_wasix_32v1_proc_spawn
 __imported_wasix_32v1_resolve
 __imported_wasix_32v1_sock_accept_v2

diff --git a/expected/wasm32-wasi/defined-symbols.txt b/expected/wasm32-wasi/defined-symbols.txt
@@ -439,7 +439,6 @@ __wasi_proc_parent
 __wasi_proc_raise
 __wasi_proc_raise_interval
 __wasi_proc_signal
-__wasi_proc_snapshot
 __wasi_proc_spawn
 __wasi_random_get
 __wasi_resolve
@@ -1717,7 +1716,6 @@ wait3
 wait4
 waitpid
 wasi_thread_start
-wasix_proc_snapshot
 wcpcpy
 wcpncpy
 wcrtomb

diff --git a/expected/wasm32-wasi/predefined-macros.txt b/expected/wasm32-wasi/predefined-macros.txt
@@ -6519,9 +6519,7 @@
 #define __wasm__ 1
 #define __wasm_atomics__ 1
 #define __wasm_bulk_memory__ 1
-#define __wasm_bulk_memory_opt__ 1
 #define __wasm_multivalue__ 1
-#define __wasm_nontrapping_fptoint__ 1
 #define __wasm_reference_types__ 1
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)

diff --git a/expected/wasm32-wasi/undefined-symbols.txt b/expected/wasm32-wasi/undefined-symbols.txt
@@ -94,7 +94,6 @@ __imported_wasix_32v1_proc_join
 __imported_wasix_32v1_proc_parent
 __imported_wasix_32v1_proc_raise_interval
 __imported_wasix_32v1_proc_signal
-__imported_wasix_32v1_proc_snapshot
 __imported_wasix_32v1_proc_spawn
 __imported_wasix_32v1_resolve
 __imported_wasix_32v1_sock_accept_v2

diff --git a/libc-top-half/musl/src/thread/thrd_create.c b/libc-top-half/musl/src/thread/thrd_create.c
@@ -3,7 +3,7 @@
 
 int thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
 {
-	int ret = __pthread_create(thr, __ATTRP_C11_THREAD, (void *(*)(void *))func, arg);
+	int ret = __pthread_create(thr, __ATTRP_C11_THREAD, (void *(*)(void *))(void *)func, arg);
 	switch (ret) {
 	case 0:      return thrd_success;
 	case EAGAIN: return thrd_nomem;

diff --git a/tools/llvm-project b/tools/llvm-project