Remove hacks for clang 8 (#384)

__FLOAT128__ has been defined since clang 9
__FLT16_* were defined until clang 9

diff --git a/Makefile b/Makefile
index 27f6760f976a4ccf987c2c1ed3a133864d5492ba..fe17d02563349c44804221790773c939aa10b747 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -665,8 +665,6 @@ check-symbols: startup_files libc
        @# its builtin include path first, which produces compiler-specific
        @# output.
        @#
-       @# 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: Filter out __GCC_HAVE_SYNC_COMPARE_AND_SWAP_* that are new to clang 16.
        @# TODO: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it
@@ -693,13 +691,11 @@ check-symbols: startup_files libc
            -U__GNUC_MINOR__ \
            -U__GNUC_PATCHLEVEL__ \
            -U__VERSION__ \
-           -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/' \
            | 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__' \
            | grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \
            > "$(SYSROOT_SHARE)/predefined-macros.txt"

diff --git a/expected/wasm32-wasi-pthread/predefined-macros.txt b/expected/wasm32-wasi-pthread/predefined-macros.txt
index 5523a77c8dd0c0b5beb0d544fc6f44ace527b6c4..a9f2982dc41c53827af913edfc36ab460b04f8a8 100644 (file)
--- a/expected/wasm32-wasi-pthread/predefined-macros.txt
+++ b/expected/wasm32-wasi-pthread/predefined-macros.txt
@@ -2489,6 +2489,7 @@
 #define __DEFINED_wctype_t 
 #define __DEFINED_wint_t 
 #define __FINITE_MATH_ONLY__ 0
+#define __FLOAT128__ 1
 #define __FLT(x) (__IS_REAL(x) && sizeof(x) == sizeof(float))
 #define __FLTCX(x) (__IS_CX(x) && sizeof(x) == sizeof(float complex))
 #define __FLT_DECIMAL_DIG__ 9

diff --git a/expected/wasm32-wasi/predefined-macros.txt b/expected/wasm32-wasi/predefined-macros.txt
index 55fb278a69fd011c3e1840eac765a9791619facf..234ad3c36a27241165c0ffc98d64a39dc88eb1f9 100644 (file)
--- a/expected/wasm32-wasi/predefined-macros.txt
+++ b/expected/wasm32-wasi/predefined-macros.txt
@@ -2452,6 +2452,7 @@
 #define __DEFINED_wctype_t 
 #define __DEFINED_wint_t 
 #define __FINITE_MATH_ONLY__ 0
+#define __FLOAT128__ 1
 #define __FLT(x) (__IS_REAL(x) && sizeof(x) == sizeof(float))
 #define __FLTCX(x) (__IS_CX(x) && sizeof(x) == sizeof(float complex))
 #define __FLT_DECIMAL_DIG__ 9