Skip to content

Commit 04431e5

Browse files
authored
Remove hacks for clang 8 (#384)
__FLOAT128__ has been defined since clang 9 __FLT16_* were defined until clang 9
1 parent 16a6940 commit 04431e5

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,6 @@ check-symbols: startup_files libc
665665
@# its builtin include path first, which produces compiler-specific
666666
@# output.
667667
@#
668-
@# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0.
669-
@# TODO: Filter out __FLT16_* for now, as not all versions of clang have these.
670668
@# TODO: Filter out __NO_MATH_ERRNO_ and a few __*WIDTH__ that are new to clang 14.
671669
@# TODO: Filter out __GCC_HAVE_SYNC_COMPARE_AND_SWAP_* that are new to clang 16.
672670
@# TODO: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it
@@ -693,13 +691,11 @@ check-symbols: startup_files libc
693691
-U__GNUC_MINOR__ \
694692
-U__GNUC_PATCHLEVEL__ \
695693
-U__VERSION__ \
696-
-U__FLOAT128__ \
697694
-U__NO_MATH_ERRNO__ \
698695
-U__BITINT_MAXWIDTH__ \
699696
-U__FLT_EVAL_METHOD__ -Wno-builtin-macro-redefined \
700697
| sed -e 's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/' \
701698
| sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \
702-
| grep -v '^#define __FLT16_' \
703699
| grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
704700
| grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \
705701
> "$(SYSROOT_SHARE)/predefined-macros.txt"

expected/wasm32-wasi-pthread/predefined-macros.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2489,6 +2489,7 @@
24892489
#define __DEFINED_wctype_t
24902490
#define __DEFINED_wint_t
24912491
#define __FINITE_MATH_ONLY__ 0
2492+
#define __FLOAT128__ 1
24922493
#define __FLT(x) (__IS_REAL(x) && sizeof(x) == sizeof(float))
24932494
#define __FLTCX(x) (__IS_CX(x) && sizeof(x) == sizeof(float complex))
24942495
#define __FLT_DECIMAL_DIG__ 9

expected/wasm32-wasi/predefined-macros.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,6 +2452,7 @@
24522452
#define __DEFINED_wctype_t
24532453
#define __DEFINED_wint_t
24542454
#define __FINITE_MATH_ONLY__ 0
2455+
#define __FLOAT128__ 1
24552456
#define __FLT(x) (__IS_REAL(x) && sizeof(x) == sizeof(float))
24562457
#define __FLTCX(x) (__IS_CX(x) && sizeof(x) == sizeof(float complex))
24572458
#define __FLT_DECIMAL_DIG__ 9

0 commit comments

Comments
 (0)