diff --git a/share/machdeps/Makefile b/share/machdeps/Makefile
index f2fc15fd2e11603d2a235e5e64f4aa128eed77e8..cc9837ac7bd19ee6d90bec388da38ddd16dd4f58 100644
--- a/share/machdeps/Makefile
+++ b/share/machdeps/Makefile
@@ -39,7 +39,7 @@ machdep_%.yaml: machdep_gcc_%.yaml Makefile
-e 's/alignof_fun: .*/alignof_fun: -1/' \
-e 's/compiler: .*/compiler: generic/' \
-e 's/machdep_name: *machdep_gcc_\([[:alnum:]]*\)/machdep_name: machdep_\1/' \
- -e '/ *#undef __GCC.*/d' -e '/ *#define __GCC.*/d' \
+ -e '/ *__GCC.*/d' \
$< > $@
.%.validated: % machdep-schema.yaml
diff --git a/share/machdeps/machdep_x86_32.yaml b/share/machdeps/machdep_x86_32.yaml
index b648de34f7866b90f0b231f1fd4fa517143bd052..5d2fa95900f4cf4e58142b7a3374156c08c3b113 100644
--- a/share/machdeps/machdep_x86_32.yaml
+++ b/share/machdeps/machdep_x86_32.yaml
@@ -21,7 +21,6 @@ custom_defs:
__ATOMIC_ACQUIRE: '2'
__FLT128_MAX_10_EXP__: '4932'
__FLT_MIN__: 1.17549435082228750796873653722224568e-38F
- __GCC_IEC_559_COMPLEX: '2'
__UINT_LEAST8_TYPE__: unsigned char
__SIZEOF_FLOAT80__: '12'
__BFLT16_DENORM_MIN__: 9.18354961579912115600575419704879436e-41BF16
@@ -35,21 +34,14 @@ custom_defs:
__BFLT16_MIN_10_EXP__: (-37)
__ORDER_LITTLE_ENDIAN__: '1234'
__WCHAR_MAX__: 0x7fffffffL
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2: '1'
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4: '1'
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8: '1'
- __GCC_ATOMIC_CHAR_LOCK_FREE: '2'
- __GCC_IEC_559: '2'
__FLT32X_DECIMAL_DIG__: '17'
__FLT_EVAL_METHOD__: '2'
__FLT64_DECIMAL_DIG__: '17'
- __GCC_ATOMIC_CHAR32_T_LOCK_FREE: '2'
__UINT_FAST64_MAX__: 0xffffffffffffffffULL
__SIG_ATOMIC_TYPE__: int
__DBL_MIN_10_EXP__: (-307)
__FINITE_MATH_ONLY__: '0'
__FLT32X_MAX_EXP__: '1024'
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1: '1'
__FLT32_HAS_DENORM__: '1'
__UINT_FAST8_MAX__: '0xff'
__FLT32_MAX_10_EXP__: '38'
@@ -65,7 +57,6 @@ custom_defs:
__LDBL_IS_IEC_60559__: '1'
__FLT64X_HAS_QUIET_NAN__: '1'
__UINT_LEAST8_MAX__: '0xff'
- __GCC_ATOMIC_BOOL_LOCK_FREE: '2'
__LAHF_SAHF__: '1'
__FLT128_DENORM_MIN__: 6.47517511943802511092443895822764655e-4966F128
__UINTMAX_TYPE__: long long unsigned int
@@ -85,7 +76,6 @@ custom_defs:
__WCHAR_MIN__: (-__WCHAR_MAX__ - 1)
__INT64_C(c): 'c ## LL'
__SSP_STRONG__: '3'
- __GCC_ATOMIC_POINTER_LOCK_FREE: '2'
__ATOMIC_SEQ_CST: '5'
__unix: '1'
__INT_LEAST64_MAX__: 0x7fffffffffffffffLL
@@ -155,7 +145,6 @@ custom_defs:
__FLT32_MAX_EXP__: '128'
__GXX_ABI_VERSION: '1018'
__FLT_MIN_EXP__: (-125)
- __GCC_HAVE_DWARF2_CFI_ASM: '1'
__INT16_MAX__: '0x7fff'
__INT_FAST64_TYPE__: long long int
__BFLT16_MAX__: 3.38953138925153547590470800371487867e+38BF16
@@ -190,7 +179,6 @@ custom_defs:
__UINT64_C(c): 'c ## ULL'
_STDC_PREDEF_H: '1'
__INT_LEAST32_MAX__: '0x7fffffff'
- __GCC_ATOMIC_INT_LOCK_FREE: '2'
__FLT128_MAX_EXP__: '16384'
__FLT32_MANT_DIG__: '24'
__FLOAT_WORD_ORDER__: __ORDER_LITTLE_ENDIAN__
@@ -217,7 +205,6 @@ custom_defs:
__FLT64X_DIG__: '18'
__INT8_TYPE__: signed char
__ELF__: '1'
- __GCC_ASM_FLAG_OUTPUTS__: '1'
__UINT32_TYPE__: unsigned int
__BFLT16_HAS_QUIET_NAN__: '1'
__FLT_RADIX__: '2'
@@ -228,7 +215,6 @@ custom_defs:
__k8: '1'
__FLT32X_MIN__: 2.22507385850720138309023271733240406e-308F32x
__SIG_ATOMIC_MAX__: '0x7fffffff'
- __GCC_ATOMIC_WCHAR_T_LOCK_FREE: '2'
__USER_LABEL_PREFIX__: ''
__SIZEOF_PTRDIFF_T__: '4'
__FLT64X_HAS_INFINITY__: '1'
@@ -240,7 +226,6 @@ custom_defs:
__FLT16_MAX_EXP__: '16'
__DEC32_SUBNORMAL_MIN__: 0.000001E-95DF
__INT_FAST16_MAX__: '0x7fffffff'
- __GCC_CONSTRUCTIVE_SIZE: '64'
__FLT64_DIG__: '15'
__UINT_FAST32_MAX__: 0xffffffffU
__UINT_LEAST64_TYPE__: long long unsigned int
@@ -288,7 +273,6 @@ custom_defs:
__FLT64X_MAX__: 1.18973149535723176502126385303097021e+4932F64x
__FLT16_HAS_INFINITY__: '1'
__SIG_ATOMIC_MIN__: (-__SIG_ATOMIC_MAX__ - 1)
- __GCC_ATOMIC_LONG_LOCK_FREE: '2'
__DEC32_MANT_DIG__: '7'
__FLT16_MANT_DIG__: '11'
__k8__: '1'
@@ -300,7 +284,6 @@ custom_defs:
__INT_FAST64_WIDTH__: '64'
__LDBL_HAS_INFINITY__: '1'
__INT_FAST64_MAX__: 0x7fffffffffffffffLL
- __GCC_ATOMIC_TEST_AND_SET_TRUEVAL: '1'
__FLT_NORM_MAX__: 3.40282346638528859811704183484516925e+38F
__FLT64X_MAX_EXP__: '16384'
__UINT_FAST64_TYPE__: long long unsigned int
@@ -312,7 +295,6 @@ custom_defs:
__DBL_MANT_DIG__: '53'
__SIZEOF_FLOAT128__: '16'
__BFLT16_MANT_DIG__: '8'
- __GCC_ATOMIC_CHAR16_T_LOCK_FREE: '2'
__DEC64_MIN__: 1E-383DD
__WINT_TYPE__: unsigned int
__UINT_LEAST32_TYPE__: unsigned int
@@ -352,7 +334,6 @@ custom_defs:
__FLT32X_MAX__: 1.79769313486231570814527423731704357e+308F32x
__DBL_NORM_MAX__: ((double)1.79769313486231570814527423731704357e+308L)
__BYTE_ORDER__: __ORDER_LITTLE_ENDIAN__
- __GCC_DESTRUCTIVE_SIZE: '64'
__INTMAX_WIDTH__: '64'
__ORDER_BIG_ENDIAN__: '4321'
__FLT32_DIG__: '6'
@@ -391,12 +372,10 @@ custom_defs:
__LDBL_MIN_10_EXP__: (-4931)
__SIZEOF_LONG_LONG__: '8'
__FLT128_DECIMAL_DIG__: '36'
- __GCC_ATOMIC_LLONG_LOCK_FREE: '2'
__FLT32_HAS_QUIET_NAN__: '1'
__FLT_DECIMAL_DIG__: '9'
__UINT_FAST16_MAX__: 0xffffffffU
__LDBL_NORM_MAX__: 1.18973149535723176502126385303097021e+4932L
- __GCC_ATOMIC_SHORT_LOCK_FREE: '2'
__SIZE_MAX__: 0xffffffffU
__UINT_FAST8_TYPE__: unsigned char
__ATOMIC_ACQ_REL: '4'
diff --git a/share/machdeps/machdep_x86_64.yaml b/share/machdeps/machdep_x86_64.yaml
index 895b02ee16d09b2a3c28a0b4a6f61bbb371b5d94..6912b0b258d5b6097fddd3333dd19f266b0a8712 100644
--- a/share/machdeps/machdep_x86_64.yaml
+++ b/share/machdeps/machdep_x86_64.yaml
@@ -21,7 +21,6 @@ custom_defs:
__ATOMIC_ACQUIRE: '2'
__FLT128_MAX_10_EXP__: '4932'
__FLT_MIN__: 1.17549435082228750796873653722224568e-38F
- __GCC_IEC_559_COMPLEX: '2'
__UINT_LEAST8_TYPE__: unsigned char
__SIZEOF_FLOAT80__: '16'
__BFLT16_DENORM_MIN__: 9.18354961579912115600575419704879436e-41BF16
@@ -35,21 +34,14 @@ custom_defs:
__BFLT16_MIN_10_EXP__: (-37)
__ORDER_LITTLE_ENDIAN__: '1234'
__WCHAR_MAX__: '0x7fffffff'
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2: '1'
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4: '1'
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8: '1'
- __GCC_ATOMIC_CHAR_LOCK_FREE: '2'
- __GCC_IEC_559: '2'
__FLT32X_DECIMAL_DIG__: '17'
__FLT_EVAL_METHOD__: '0'
__FLT64_DECIMAL_DIG__: '17'
- __GCC_ATOMIC_CHAR32_T_LOCK_FREE: '2'
__UINT_FAST64_MAX__: 0xffffffffffffffffUL
__SIG_ATOMIC_TYPE__: int
__DBL_MIN_10_EXP__: (-307)
__FINITE_MATH_ONLY__: '0'
__FLT32X_MAX_EXP__: '1024'
- __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1: '1'
__FLT32_HAS_DENORM__: '1'
__UINT_FAST8_MAX__: '0xff'
__FLT32_MAX_10_EXP__: '38'
@@ -65,7 +57,6 @@ custom_defs:
__LDBL_IS_IEC_60559__: '1'
__FLT64X_HAS_QUIET_NAN__: '1'
__UINT_LEAST8_MAX__: '0xff'
- __GCC_ATOMIC_BOOL_LOCK_FREE: '2'
__FLT128_DENORM_MIN__: 6.47517511943802511092443895822764655e-4966F128
__UINTMAX_TYPE__: long unsigned int
__BFLT16_DECIMAL_DIG__: '4'
@@ -84,7 +75,6 @@ custom_defs:
__WCHAR_MIN__: (-__WCHAR_MAX__ - 1)
__INT64_C(c): 'c ## L'
__SSP_STRONG__: '3'
- __GCC_ATOMIC_POINTER_LOCK_FREE: '2'
__ATOMIC_SEQ_CST: '5'
__unix: '1'
__INT_LEAST64_MAX__: 0x7fffffffffffffffL
@@ -157,7 +147,6 @@ custom_defs:
__FLT32_MAX_EXP__: '128'
__GXX_ABI_VERSION: '1018'
__FLT_MIN_EXP__: (-125)
- __GCC_HAVE_DWARF2_CFI_ASM: '1'
__INT16_MAX__: '0x7fff'
__x86_64: '1'
__INT_FAST64_TYPE__: long int
@@ -193,7 +182,6 @@ custom_defs:
__UINT64_C(c): 'c ## UL'
_STDC_PREDEF_H: '1'
__INT_LEAST32_MAX__: '0x7fffffff'
- __GCC_ATOMIC_INT_LOCK_FREE: '2'
__FLT128_MAX_EXP__: '16384'
__FLT32_MANT_DIG__: '24'
__FLOAT_WORD_ORDER__: __ORDER_LITTLE_ENDIAN__
@@ -217,7 +205,6 @@ custom_defs:
__FLT64X_DIG__: '18'
__INT8_TYPE__: signed char
__ELF__: '1'
- __GCC_ASM_FLAG_OUTPUTS__: '1'
__UINT32_TYPE__: unsigned int
__BFLT16_HAS_QUIET_NAN__: '1'
__FLT_RADIX__: '2'
@@ -229,7 +216,6 @@ custom_defs:
__k8: '1'
__FLT32X_MIN__: 2.22507385850720138309023271733240406e-308F32x
__SIG_ATOMIC_MAX__: '0x7fffffff'
- __GCC_ATOMIC_WCHAR_T_LOCK_FREE: '2'
__USER_LABEL_PREFIX__: ''
__SIZEOF_PTRDIFF_T__: '8'
__FLT64X_HAS_INFINITY__: '1'
@@ -242,7 +228,6 @@ custom_defs:
__FLT16_MAX_EXP__: '16'
__DEC32_SUBNORMAL_MIN__: 0.000001E-95DF
__INT_FAST16_MAX__: 0x7fffffffffffffffL
- __GCC_CONSTRUCTIVE_SIZE: '64'
__FLT64_DIG__: '15'
__UINT_FAST32_MAX__: 0xffffffffffffffffUL
__UINT_LEAST64_TYPE__: long unsigned int
@@ -289,7 +274,6 @@ custom_defs:
__FLT16_HAS_INFINITY__: '1'
__SIG_ATOMIC_MIN__: (-__SIG_ATOMIC_MAX__ - 1)
__code_model_small__: '1'
- __GCC_ATOMIC_LONG_LOCK_FREE: '2'
__DEC32_MANT_DIG__: '7'
__FLT16_MANT_DIG__: '11'
__k8__: '1'
@@ -301,7 +285,6 @@ custom_defs:
__INT_FAST64_WIDTH__: '64'
__LDBL_HAS_INFINITY__: '1'
__INT_FAST64_MAX__: 0x7fffffffffffffffL
- __GCC_ATOMIC_TEST_AND_SET_TRUEVAL: '1'
__FLT_NORM_MAX__: 3.40282346638528859811704183484516925e+38F
__FLT64X_MAX_EXP__: '16384'
__UINT_FAST64_TYPE__: long unsigned int
@@ -314,7 +297,6 @@ custom_defs:
__DBL_MANT_DIG__: '53'
__SIZEOF_FLOAT128__: '16'
__BFLT16_MANT_DIG__: '8'
- __GCC_ATOMIC_CHAR16_T_LOCK_FREE: '2'
__DEC64_MIN__: 1E-383DD
__WINT_TYPE__: unsigned int
__UINT_LEAST32_TYPE__: unsigned int
@@ -357,7 +339,6 @@ custom_defs:
__FLT32X_MAX__: 1.79769313486231570814527423731704357e+308F32x
__DBL_NORM_MAX__: ((double)1.79769313486231570814527423731704357e+308L)
__BYTE_ORDER__: __ORDER_LITTLE_ENDIAN__
- __GCC_DESTRUCTIVE_SIZE: '64'
__INTMAX_WIDTH__: '64'
__FLT32_DIG__: '6'
__UINT32_C(c): 'c ## U'
@@ -395,12 +376,10 @@ custom_defs:
__LDBL_MIN_10_EXP__: (-4931)
__SIZEOF_LONG_LONG__: '8'
__FLT128_DECIMAL_DIG__: '36'
- __GCC_ATOMIC_LLONG_LOCK_FREE: '2'
__FLT32_HAS_QUIET_NAN__: '1'
__FLT_DECIMAL_DIG__: '9'
__UINT_FAST16_MAX__: 0xffffffffffffffffUL
__LDBL_NORM_MAX__: 1.18973149535723176502126385303097021e+4932L
- __GCC_ATOMIC_SHORT_LOCK_FREE: '2'
__SIZE_MAX__: 0xffffffffffffffffUL
__UINT_FAST8_TYPE__: unsigned char
__ATOMIC_ACQ_REL: '4'