Skip to content

Commit 1a033a9

Browse files
committed
Bug 1943879 - Update wasi-libc build-time check for latest LLVM trunk. r=firefox-build-system-reviewers,sergesanspaille
Submitted upstream at WebAssembly/wasi-libc#564 Differential Revision: https://phabricator.services.mozilla.com/D235726
1 parent 5b53361 commit 1a033a9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

taskcluster/scripts/misc/wasi-sdk.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ index f350ecb..3b73115 100644
4242
grep '^_*imported_wasi_' "$(UNDEFINED_SYMBOLS)" \
4343
> "$(SYSROOT_LIB)/libc.imports"
4444

45-
@@ -671,10 +671,20 @@ check-symbols: startup_files libc
45+
@@ -671,10 +671,21 @@ check-symbols: startup_files libc
4646
@#
4747
@# TODO: Filter out __NO_MATH_ERRNO_ and a few __*WIDTH__ that are new to clang 14.
4848
@# TODO: Filter out __GCC_HAVE_SYNC_COMPARE_AND_SWAP_* that are new to clang 16.
@@ -52,6 +52,7 @@ index f350ecb..3b73115 100644
5252
+ @# TODO: Filter out __GCC_(CON|DE)STRUCTIVE_SIZE that are new to clang 19.
5353
+ @# TODO: Filter out __STDC_EMBED_* that are new to clang 19.
5454
+ @# TODO: Filter out __*_NORM_MAX__ that are new to clang 19.
55+
+ @# TODO: Filter out __*INT*_C() that are new to clang 20.
5556
@# TODO: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it
5657
@# for older versions.
5758
@# TODO: Undefine __wasm_mutable_globals__ and __wasm_sign_ext__, that are new to
@@ -63,7 +64,7 @@ index f350ecb..3b73115 100644
6364
@# TODO: As of clang 16, __GNUC_VA_LIST is #defined without a value.
6465
$(CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
6566
-isystem $(SYSROOT_INC) \
66-
@@ -691,6 +700,11 @@ check-symbols: startup_files libc
67+
@@ -691,6 +701,11 @@ check-symbols: startup_files libc
6768
-U__clang_wide_literal_encoding__ \
6869
-U__wasm_mutable_globals__ \
6970
-U__wasm_sign_ext__ \
@@ -75,7 +76,7 @@ index f350ecb..3b73115 100644
7576
-U__GNUC__ \
7677
-U__GNUC_MINOR__ \
7778
-U__GNUC_PATCHLEVEL__ \
78-
@@ -702,6 +717,12 @@ check-symbols: startup_files libc
79+
@@ -702,6 +717,13 @@ check-symbols: startup_files libc
7980
| sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \
8081
| grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
8182
| grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \
@@ -85,6 +86,7 @@ index f350ecb..3b73115 100644
8586
+ | grep -v '^#define __GCC_\(CON\|DE\)STRUCTIVE_SIZE' \
8687
+ | grep -v '^#define __STDC_EMBED_' \
8788
+ | grep -v '^#define __\(DBL\|FLT\|LDBL\)_NORM_MAX__' \
89+
+ | grep -v '^#define __U\?INT.*_C(' \
8890
> "$(SYSROOT_SHARE)/predefined-macros.txt"
8991

9092
# Check that the computed metadata matches the expected metadata.

0 commit comments

Comments
 (0)