wasi-libc build failure

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Hi!

wasi-libc has stopped compiling for me, with:

clang -O2 -DNDEBUG --target=wasm32-wasi -fno-trapping-math -Wall -Wextra -Werror -Wno-null-pointer-arithmetic -Wno-unused-parameter -Wno-sign-compare -Wno-unused-variable -Wno-unused-function -Wno-ignored-attributes -Wno-missing-braces -Wno-ignored-pragmas -Wno-unused-but-set-variable -Wno-unknown-warning-option -mthread-model single --sysroot="/scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/sysroot" "/scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/sysroot/share/wasm32-wasi/include-all.c" \
    -isystem /scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/sysroot/include \
    -std=gnu17 \
    -E -dM -Wno-\#warnings \
    -D_ALL_SOURCE \
    -U__llvm__ \
    -U__clang__ \
    -U__clang_major__ \
    -U__clang_minor__ \
    -U__clang_patchlevel__ \
    -U__clang_version__ \
    -U__clang_literal_encoding__ \
    -U__clang_wide_literal_encoding__ \
    -U__GNUC__ \
    -U__GNUC_MINOR__ \
    -U__GNUC_PATCHLEVEL__ \
    -U__VERSION__ \
    -U__FLOAT128__ \
    | sed -e 's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/' \
    | grep -v '^#define __FLT16_' \
    > "/scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/sysroot/share/wasm32-wasi/predefined-macros.txt"
# Check that the computed metadata matches the expected metadata.
# This ignores whitespace because on Windows the output has CRLF line endings.
diff -wur "/scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/expected/wasm32-wasi" "/scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/sysroot/share/wasm32-wasi"
diff -wur /scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/expected/wasm32-wasi/predefined-macros.txt /scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/sysroot/share/wasm32-wasi/predefined-macros.txt
--- /scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/expected/wasm32-wasi/predefined-macros.txt  2021-09-22 22:36:47.000000000 +0000
+++ /scratch/lang/wasi-libc/work/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96/sysroot/share/wasm32-wasi/predefined-macros.txt     2022-03-14 02:23:20.002243042 +0000
@@ -2652,6 +2652,7 @@
 #define __ORDER_LITTLE_ENDIAN__ 1234
 #define __ORDER_PDP_ENDIAN__ 3412
 #define __PDP_ENDIAN 3412
+#define __PIC__ 2
 #define __POINTER_WIDTH__ 32
 #define __PRAGMA_REDEFINE_EXTNAME 1
 #define __PTRDIFF_FMTd__ "ld"
@@ -3003,6 +3004,7 @@
 #define __bitop(x,i,o) ((x)[(i)/8] o (1<<(i)%8))
 #define __bool_true_false_are_defined 1
 #define __inline inline
+#define __pic__ 2
 #define __restrict restrict
 #define __tg_complex(fun,x) (__RETCAST_CX(x)( __FLTCX((x)+I) && __IS_FP(x) ? fun ## f (x) : __LDBLCX((x)+I) ? fun ## l (x) : fun(x) ))
 #define __tg_complex_retreal(fun,x) (__RETCAST_REAL(x)( __FLTCX((x)+I) && __IS_FP(x) ? fun ## f (x) : __LDBLCX((x)+I) ? fun ## l (x) : fun(x) ))
@@ -3090,6 +3092,7 @@
 #define __wasm32 1
 #define __wasm32__ 1
 #define __wasm__ 1
+#define __wasm_mutable_globals__ 1
 #define _tolower(a) ((a)|0x20)
 #define _toupper(a) ((a)&0x5f)
 #define acos(x) __tg_real_complex(acos, (x))
gmake: *** [Makefile:513: check-symbols] Error 1
*** Error code 2


(NetBSD-9.99.94/amd64)

My last successful build was from Feb 15 (on 9.99.93), but there were
no changes to the package itself since then, so perhaps mk/ stuff?
 Thomas