From: Mike Hommey <mh@glandium.org>
Date: Thu, 21 Apr 2022 02:52:43 +0000 (+0900)
Subject: Adjust the Makefile for LLVM 15 as of 2022-04-20
X-Git-Url: https://git.proxmox.com/?p=wasi-libc.git;a=commitdiff_plain;h=e9fcbdead881115cdf03cc98f50925c51a30a294

Adjust the Makefile for LLVM 15 as of 2022-04-20
---

diff --git a/Makefile b/Makefile
index b9f3c00..98aa995 100644
--- a/Makefile
+++ b/Makefile
@@ -536,6 +536,8 @@ check-symbols: startup_files libc
 	@# 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: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it
+	@# for older versions.
 	$(CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
 	    -isystem $(SYSROOT_INC) \
 	    -std=gnu17 \
@@ -556,6 +558,7 @@ check-symbols: startup_files libc
 	    -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/' \
 	    | grep -v '^#define __FLT16_' \
 	    | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
diff --git a/expected/wasm32-wasi/predefined-macros.txt b/expected/wasm32-wasi/predefined-macros.txt
index 5248cb2..f1389b5 100644
--- a/expected/wasm32-wasi/predefined-macros.txt
+++ b/expected/wasm32-wasi/predefined-macros.txt
@@ -2459,7 +2459,6 @@
 #define __FLT_DENORM_MIN__ 1.40129846e-45F
 #define __FLT_DIG__ 6
 #define __FLT_EPSILON__ 1.19209290e-7F
-#define __FLT_EVAL_METHOD__ 0
 #define __FLT_HAS_DENORM__ 1
 #define __FLT_HAS_INFINITY__ 1
 #define __FLT_HAS_QUIET_NAN__ 1