Skip to content

Commit

Permalink
Adjust Makefile for LLVM trunk (16) as of 2022-11-08 (#344)
Browse files Browse the repository at this point in the history
llvm/llvm-project@1e4e243
enabled sign-ext and mutable-globals by default, which adds
corresponding __wasm_-prefixed #defines.

llvm/llvm-project@9e95699
changed the definition of __GNUC_VA_LIST to match that of GCC headers,
leaving it without a value.
  • Loading branch information
glandium authored Dec 7, 2022
1 parent 8b7148f commit 3a261b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,9 @@ check-symbols: startup_files libc
@# 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.
@# TODO: Undefine __wasm_mutable_globals__ and __wasm_sign_ext__, that are new to
@# clang 16 for -mcpu=generic.
@# TODO: As of clang 16, __GNUC_VA_LIST is #defined without a value.
$(CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
-isystem $(SYSROOT_INC) \
-std=gnu17 \
Expand All @@ -663,6 +666,8 @@ check-symbols: startup_files libc
-U__clang_version__ \
-U__clang_literal_encoding__ \
-U__clang_wide_literal_encoding__ \
-U__wasm_mutable_globals__ \
-U__wasm_sign_ext__ \
-U__GNUC__ \
-U__GNUC_MINOR__ \
-U__GNUC_PATCHLEVEL__ \
Expand All @@ -672,6 +677,7 @@ check-symbols: startup_files libc
-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__' \
> "$(SYSROOT_SHARE)/predefined-macros.txt"
Expand Down
2 changes: 0 additions & 2 deletions expected/wasm32-wasi/posix/predefined-macros.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3099,8 +3099,6 @@
#define __wasm__ 1
#define __wasm_atomics__ 1
#define __wasm_bulk_memory__ 1
#define __wasm_mutable_globals__ 1
#define __wasm_sign_ext__ 1
#define _tolower(a) ((a)|0x20)
#define _toupper(a) ((a)&0x5f)
#define acos(x) __tg_real_complex(acos, (x))
Expand Down

0 comments on commit 3a261b0

Please sign in to comment.