From eda7524ecc6759530548d0ab2392387f61feeb25 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 11 Dec 2023 20:10:59 +0000 Subject: [PATCH] Bug 1868918 - Update wasi-libc build-time check for latest LLVM trunk. r=firefox-build-system-reviewers,sergesanspaille Submitted upstream at https://github.com/WebAssembly/wasi-libc/pull/448 Differential Revision: https://phabricator.services.mozilla.com/D195841 --- taskcluster/scripts/misc/wasi-sdk.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/taskcluster/scripts/misc/wasi-sdk.patch b/taskcluster/scripts/misc/wasi-sdk.patch index edec9b9008f51..fe38e49e2758b 100644 --- a/taskcluster/scripts/misc/wasi-sdk.patch +++ b/taskcluster/scripts/misc/wasi-sdk.patch @@ -2,21 +2,23 @@ diff --git a/src/wasi-libc/Makefile b/src/wasi-libc/Makefile index f350ecb..9a5c940 100644 --- a/src/wasi-libc/Makefile +++ b/src/wasi-libc/Makefile -@@ -671,6 +671,8 @@ check-symbols: startup_files libc +@@ -671,6 +671,9 @@ check-symbols: startup_files libc @# @# 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: Filter out __FPCLASS_* that are new to clang 17. + @# TODO: Filter out __FLT128_* that are new to clang 18. ++ @# TODO: Filter out __MEMORY_SCOPE_* that are new to clang 18. @# 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 -@@ -702,6 +703,8 @@ check-symbols: startup_files libc +@@ -702,6 +703,9 @@ check-symbols: startup_files libc | sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \ | 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\)' \ + | grep -v '^#define __FPCLASS_' \ + | grep -v '^#define __FLT128_' \ ++ | grep -v '^#define __MEMORY_SCOPE_' \ > "$(SYSROOT_SHARE)/predefined-macros.txt" # Check that the computed metadata matches the expected metadata.