Merge branch 'master' into proxmox/bookworm

[wasi-libc.git] / Makefile

diff --git a/Makefile b/Makefile
index 46229f930af8a28fc5e033932072c713e158a967..57975a799d144c2930311a84524b2c5f71a73c66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ TARGET_TRIPLE = wasm32-wasi
 # Threaded version necessitates a different traget, as objects from different
 # targets can't be mixed together while linking.
 ifeq ($(THREAD_MODEL), posix)
-TARGET_TRIPLE = wasm32-wasi-pthread
+TARGET_TRIPLE = wasm32-wasi-threads
 endif
 
 # These variables describe the locations of various files and directories in
@@ -210,6 +210,7 @@ LIBC_TOP_HALF_MUSL_SOURCES += \
         thread/pthread_attr_get.c \
         thread/pthread_attr_init.c \
         thread/pthread_attr_setstack.c \
+        thread/pthread_attr_setdetachstate.c \
         thread/pthread_attr_setstacksize.c \
         thread/pthread_barrier_destroy.c \
         thread/pthread_barrier_init.c \
@@ -665,9 +666,8 @@ check-symbols: startup_files libc
        @# its builtin include path first, which produces compiler-specific
        @# output.
        @#
-       @# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0.
-       @# TODO: Filter out __FLT16_* for now, as not all versions of clang have these.
        @# TODO: Filter out __NO_MATH_ERRNO_ and a few __*WIDTH__ that are new to clang 14.
+       @# TODO: Filter out __GCC_HAVE_SYNC_COMPARE_AND_SWAP_* that are new to clang 16.
        @# TODO: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it
        @# for older versions.
        @# TODO: Undefine __wasm_mutable_globals__ and __wasm_sign_ext__, that are new to
@@ -692,14 +692,13 @@ check-symbols: startup_files libc
            -U__GNUC_MINOR__ \
            -U__GNUC_PATCHLEVEL__ \
            -U__VERSION__ \
-           -U__FLOAT128__ \
            -U__NO_MATH_ERRNO__ \
            -U__BITINT_MAXWIDTH__ \
            -U__FLT_EVAL_METHOD__ -Wno-builtin-macro-redefined \
            | sed -e 's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/' \
            | sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \
-           | grep -v '^#define __FLT16_' \
            | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
+           | grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \
            > "$(SYSROOT_SHARE)/predefined-macros.txt"
 
        # Check that the computed metadata matches the expected metadata.