diff --git a/tests/fc_script/oracle/custom_machdep.yaml b/tests/fc_script/oracle/custom_machdep.yaml
index 1f9baf6d70cb09080d8ddf8d099b098da5577d07..24f472d19e21723c8f7bf328c8ff0a0bea41a373 100644
--- a/tests/fc_script/oracle/custom_machdep.yaml
+++ b/tests/fc_script/oracle/custom_machdep.yaml
@@ -13,840 +13,131 @@ bufsiz: '8192'
 char_is_unsigned: false
 compiler: clang
 cpp_arch_flags:
-- --target=x86_64
-custom_defs: |
-    #undef _LP64
-    #define _LP64 1
-    #undef __ATOMIC_ACQUIRE
-    #define __ATOMIC_ACQUIRE 2
-    #undef __ATOMIC_ACQ_REL
-    #define __ATOMIC_ACQ_REL 4
-    #undef __ATOMIC_CONSUME
-    #define __ATOMIC_CONSUME 1
-    #undef __ATOMIC_RELAXED
-    #define __ATOMIC_RELAXED 0
-    #undef __ATOMIC_RELEASE
-    #define __ATOMIC_RELEASE 3
-    #undef __ATOMIC_SEQ_CST
-    #define __ATOMIC_SEQ_CST 5
-    #undef __BIGGEST_ALIGNMENT__
-    #define __BIGGEST_ALIGNMENT__ 16
-    #undef __BITINT_MAXWIDTH__
-    #define __BITINT_MAXWIDTH__ 128
-    #undef __BOOL_WIDTH__
-    #define __BOOL_WIDTH__ 8
-    #undef __BYTE_ORDER__
-    #define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
-    #undef __CHAR16_TYPE__
-    #define __CHAR16_TYPE__ unsigned short
-    #undef __CHAR32_TYPE__
-    #define __CHAR32_TYPE__ unsigned int
-    #undef __CHAR_BIT__
-    #define __CHAR_BIT__ 8
-    #undef __CLANG_ATOMIC_BOOL_LOCK_FREE
-    #define __CLANG_ATOMIC_BOOL_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_CHAR16_T_LOCK_FREE
-    #define __CLANG_ATOMIC_CHAR16_T_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_CHAR32_T_LOCK_FREE
-    #define __CLANG_ATOMIC_CHAR32_T_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_CHAR_LOCK_FREE
-    #define __CLANG_ATOMIC_CHAR_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_INT_LOCK_FREE
-    #define __CLANG_ATOMIC_INT_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_LLONG_LOCK_FREE
-    #define __CLANG_ATOMIC_LLONG_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_LONG_LOCK_FREE
-    #define __CLANG_ATOMIC_LONG_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_POINTER_LOCK_FREE
-    #define __CLANG_ATOMIC_POINTER_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_SHORT_LOCK_FREE
-    #define __CLANG_ATOMIC_SHORT_LOCK_FREE 2
-    #undef __CLANG_ATOMIC_WCHAR_T_LOCK_FREE
-    #define __CLANG_ATOMIC_WCHAR_T_LOCK_FREE 2
-    #undef __CONSTANT_CFSTRINGS__
-    #define __CONSTANT_CFSTRINGS__ 1
-    #undef __DBL_DECIMAL_DIG__
-    #define __DBL_DECIMAL_DIG__ 17
-    #undef __DBL_DENORM_MIN__
-    #define __DBL_DENORM_MIN__ 4.9406564584124654e-324
-    #undef __DBL_DIG__
-    #define __DBL_DIG__ 15
-    #undef __DBL_EPSILON__
-    #define __DBL_EPSILON__ 2.2204460492503131e-16
-    #undef __DBL_HAS_DENORM__
-    #define __DBL_HAS_DENORM__ 1
-    #undef __DBL_HAS_INFINITY__
-    #define __DBL_HAS_INFINITY__ 1
-    #undef __DBL_HAS_QUIET_NAN__
-    #define __DBL_HAS_QUIET_NAN__ 1
-    #undef __DBL_MANT_DIG__
-    #define __DBL_MANT_DIG__ 53
-    #undef __DBL_MAX_10_EXP__
-    #define __DBL_MAX_10_EXP__ 308
-    #undef __DBL_MAX_EXP__
-    #define __DBL_MAX_EXP__ 1024
-    #undef __DBL_MAX__
-    #define __DBL_MAX__ 1.7976931348623157e+308
-    #undef __DBL_MIN_10_EXP__
-    #define __DBL_MIN_10_EXP__ (-307)
-    #undef __DBL_MIN_EXP__
-    #define __DBL_MIN_EXP__ (-1021)
-    #undef __DBL_MIN__
-    #define __DBL_MIN__ 2.2250738585072014e-308
-    #undef __DECIMAL_DIG__
-    #define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__
-    #undef __FINITE_MATH_ONLY__
-    #define __FINITE_MATH_ONLY__ 0
-    #undef __FLT16_DECIMAL_DIG__
-    #define __FLT16_DECIMAL_DIG__ 5
-    #undef __FLT16_DENORM_MIN__
-    #define __FLT16_DENORM_MIN__ 5.9604644775390625e-8F16
-    #undef __FLT16_DIG__
-    #define __FLT16_DIG__ 3
-    #undef __FLT16_EPSILON__
-    #define __FLT16_EPSILON__ 9.765625e-4F16
-    #undef __FLT16_HAS_DENORM__
-    #define __FLT16_HAS_DENORM__ 1
-    #undef __FLT16_HAS_INFINITY__
-    #define __FLT16_HAS_INFINITY__ 1
-    #undef __FLT16_HAS_QUIET_NAN__
-    #define __FLT16_HAS_QUIET_NAN__ 1
-    #undef __FLT16_MANT_DIG__
-    #define __FLT16_MANT_DIG__ 11
-    #undef __FLT16_MAX_10_EXP__
-    #define __FLT16_MAX_10_EXP__ 4
-    #undef __FLT16_MAX_EXP__
-    #define __FLT16_MAX_EXP__ 16
-    #undef __FLT16_MAX__
-    #define __FLT16_MAX__ 6.5504e+4F16
-    #undef __FLT16_MIN_10_EXP__
-    #define __FLT16_MIN_10_EXP__ (-4)
-    #undef __FLT16_MIN_EXP__
-    #define __FLT16_MIN_EXP__ (-13)
-    #undef __FLT16_MIN__
-    #define __FLT16_MIN__ 6.103515625e-5F16
-    #undef __FLT_DECIMAL_DIG__
-    #define __FLT_DECIMAL_DIG__ 9
-    #undef __FLT_DENORM_MIN__
-    #define __FLT_DENORM_MIN__ 1.40129846e-45F
-    #undef __FLT_DIG__
-    #define __FLT_DIG__ 6
-    #undef __FLT_EPSILON__
-    #define __FLT_EPSILON__ 1.19209290e-7F
-    #undef __FLT_HAS_DENORM__
-    #define __FLT_HAS_DENORM__ 1
-    #undef __FLT_HAS_INFINITY__
-    #define __FLT_HAS_INFINITY__ 1
-    #undef __FLT_HAS_QUIET_NAN__
-    #define __FLT_HAS_QUIET_NAN__ 1
-    #undef __FLT_MANT_DIG__
-    #define __FLT_MANT_DIG__ 24
-    #undef __FLT_MAX_10_EXP__
-    #define __FLT_MAX_10_EXP__ 38
-    #undef __FLT_MAX_EXP__
-    #define __FLT_MAX_EXP__ 128
-    #undef __FLT_MAX__
-    #define __FLT_MAX__ 3.40282347e+38F
-    #undef __FLT_MIN_10_EXP__
-    #define __FLT_MIN_10_EXP__ (-37)
-    #undef __FLT_MIN_EXP__
-    #define __FLT_MIN_EXP__ (-125)
-    #undef __FLT_MIN__
-    #define __FLT_MIN__ 1.17549435e-38F
-    #undef __FLT_RADIX__
-    #define __FLT_RADIX__ 2
-    #undef __FXSR__
-    #define __FXSR__ 1
-    #undef __GCC_ASM_FLAG_OUTPUTS__
-    #define __GCC_ASM_FLAG_OUTPUTS__ 1
-    #undef __GCC_ATOMIC_BOOL_LOCK_FREE
-    #define __GCC_ATOMIC_BOOL_LOCK_FREE 2
-    #undef __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-    #define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
-    #undef __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-    #define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
-    #undef __GCC_ATOMIC_CHAR_LOCK_FREE
-    #define __GCC_ATOMIC_CHAR_LOCK_FREE 2
-    #undef __GCC_ATOMIC_INT_LOCK_FREE
-    #define __GCC_ATOMIC_INT_LOCK_FREE 2
-    #undef __GCC_ATOMIC_LLONG_LOCK_FREE
-    #define __GCC_ATOMIC_LLONG_LOCK_FREE 2
-    #undef __GCC_ATOMIC_LONG_LOCK_FREE
-    #define __GCC_ATOMIC_LONG_LOCK_FREE 2
-    #undef __GCC_ATOMIC_POINTER_LOCK_FREE
-    #define __GCC_ATOMIC_POINTER_LOCK_FREE 2
-    #undef __GCC_ATOMIC_SHORT_LOCK_FREE
-    #define __GCC_ATOMIC_SHORT_LOCK_FREE 2
-    #undef __GCC_ATOMIC_TEST_AND_SET_TRUEVAL
-    #define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
-    #undef __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-    #define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
-    #undef __GCC_HAVE_DWARF2_CFI_ASM
-    #define __GCC_HAVE_DWARF2_CFI_ASM 1
-    #undef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
-    #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-    #undef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
-    #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-    #undef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
-    #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-    #undef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
-    #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-    #undef __GNUC_MINOR__
-    #define __GNUC_MINOR__ 2
-    #undef __GNUC_PATCHLEVEL__
-    #define __GNUC_PATCHLEVEL__ 1
-    #undef __GNUC_STDC_INLINE__
-    #define __GNUC_STDC_INLINE__ 1
-    #undef __GNUC__
-    #define __GNUC__ 4
-    #undef __GXX_ABI_VERSION
-    #define __GXX_ABI_VERSION 1002
-    #undef __INT16_C_SUFFIX__
-    #define __INT16_C_SUFFIX__
-    #undef __INT16_FMTd__
-    #define __INT16_FMTd__ "hd"
-    #undef __INT16_FMTi__
-    #define __INT16_FMTi__ "hi"
-    #undef __INT16_MAX__
-    #define __INT16_MAX__ 32767
-    #undef __INT16_TYPE__
-    #define __INT16_TYPE__ short
-    #undef __INT32_C_SUFFIX__
-    #define __INT32_C_SUFFIX__
-    #undef __INT32_FMTd__
-    #define __INT32_FMTd__ "d"
-    #undef __INT32_FMTi__
-    #define __INT32_FMTi__ "i"
-    #undef __INT32_MAX__
-    #define __INT32_MAX__ 2147483647
-    #undef __INT32_TYPE__
-    #define __INT32_TYPE__ int
-    #undef __INT64_C_SUFFIX__
-    #define __INT64_C_SUFFIX__ L
-    #undef __INT64_FMTd__
-    #define __INT64_FMTd__ "ld"
-    #undef __INT64_FMTi__
-    #define __INT64_FMTi__ "li"
-    #undef __INT64_MAX__
-    #define __INT64_MAX__ 9223372036854775807L
-    #undef __INT64_TYPE__
-    #define __INT64_TYPE__ long int
-    #undef __INT8_C_SUFFIX__
-    #define __INT8_C_SUFFIX__
-    #undef __INT8_FMTd__
-    #define __INT8_FMTd__ "hhd"
-    #undef __INT8_FMTi__
-    #define __INT8_FMTi__ "hhi"
-    #undef __INT8_MAX__
-    #define __INT8_MAX__ 127
-    #undef __INT8_TYPE__
-    #define __INT8_TYPE__ signed char
-    #undef __INTMAX_C_SUFFIX__
-    #define __INTMAX_C_SUFFIX__ L
-    #undef __INTMAX_FMTd__
-    #define __INTMAX_FMTd__ "ld"
-    #undef __INTMAX_FMTi__
-    #define __INTMAX_FMTi__ "li"
-    #undef __INTMAX_MAX__
-    #define __INTMAX_MAX__ 9223372036854775807L
-    #undef __INTMAX_TYPE__
-    #define __INTMAX_TYPE__ long int
-    #undef __INTMAX_WIDTH__
-    #define __INTMAX_WIDTH__ 64
-    #undef __INTPTR_FMTd__
-    #define __INTPTR_FMTd__ "ld"
-    #undef __INTPTR_FMTi__
-    #define __INTPTR_FMTi__ "li"
-    #undef __INTPTR_MAX__
-    #define __INTPTR_MAX__ 9223372036854775807L
-    #undef __INTPTR_TYPE__
-    #define __INTPTR_TYPE__ long int
-    #undef __INTPTR_WIDTH__
-    #define __INTPTR_WIDTH__ 64
-    #undef __INT_FAST16_FMTd__
-    #define __INT_FAST16_FMTd__ "hd"
-    #undef __INT_FAST16_FMTi__
-    #define __INT_FAST16_FMTi__ "hi"
-    #undef __INT_FAST16_MAX__
-    #define __INT_FAST16_MAX__ 32767
-    #undef __INT_FAST16_TYPE__
-    #define __INT_FAST16_TYPE__ short
-    #undef __INT_FAST16_WIDTH__
-    #define __INT_FAST16_WIDTH__ 16
-    #undef __INT_FAST32_FMTd__
-    #define __INT_FAST32_FMTd__ "d"
-    #undef __INT_FAST32_FMTi__
-    #define __INT_FAST32_FMTi__ "i"
-    #undef __INT_FAST32_MAX__
-    #define __INT_FAST32_MAX__ 2147483647
-    #undef __INT_FAST32_TYPE__
-    #define __INT_FAST32_TYPE__ int
-    #undef __INT_FAST32_WIDTH__
-    #define __INT_FAST32_WIDTH__ 32
-    #undef __INT_FAST64_FMTd__
-    #define __INT_FAST64_FMTd__ "ld"
-    #undef __INT_FAST64_FMTi__
-    #define __INT_FAST64_FMTi__ "li"
-    #undef __INT_FAST64_MAX__
-    #define __INT_FAST64_MAX__ 9223372036854775807L
-    #undef __INT_FAST64_TYPE__
-    #define __INT_FAST64_TYPE__ long int
-    #undef __INT_FAST64_WIDTH__
-    #define __INT_FAST64_WIDTH__ 64
-    #undef __INT_FAST8_FMTd__
-    #define __INT_FAST8_FMTd__ "hhd"
-    #undef __INT_FAST8_FMTi__
-    #define __INT_FAST8_FMTi__ "hhi"
-    #undef __INT_FAST8_MAX__
-    #define __INT_FAST8_MAX__ 127
-    #undef __INT_FAST8_TYPE__
-    #define __INT_FAST8_TYPE__ signed char
-    #undef __INT_FAST8_WIDTH__
-    #define __INT_FAST8_WIDTH__ 8
-    #undef __INT_LEAST16_FMTd__
-    #define __INT_LEAST16_FMTd__ "hd"
-    #undef __INT_LEAST16_FMTi__
-    #define __INT_LEAST16_FMTi__ "hi"
-    #undef __INT_LEAST16_MAX__
-    #define __INT_LEAST16_MAX__ 32767
-    #undef __INT_LEAST16_TYPE__
-    #define __INT_LEAST16_TYPE__ short
-    #undef __INT_LEAST16_WIDTH__
-    #define __INT_LEAST16_WIDTH__ 16
-    #undef __INT_LEAST32_FMTd__
-    #define __INT_LEAST32_FMTd__ "d"
-    #undef __INT_LEAST32_FMTi__
-    #define __INT_LEAST32_FMTi__ "i"
-    #undef __INT_LEAST32_MAX__
-    #define __INT_LEAST32_MAX__ 2147483647
-    #undef __INT_LEAST32_TYPE__
-    #define __INT_LEAST32_TYPE__ int
-    #undef __INT_LEAST32_WIDTH__
-    #define __INT_LEAST32_WIDTH__ 32
-    #undef __INT_LEAST64_FMTd__
-    #define __INT_LEAST64_FMTd__ "ld"
-    #undef __INT_LEAST64_FMTi__
-    #define __INT_LEAST64_FMTi__ "li"
-    #undef __INT_LEAST64_MAX__
-    #define __INT_LEAST64_MAX__ 9223372036854775807L
-    #undef __INT_LEAST64_TYPE__
-    #define __INT_LEAST64_TYPE__ long int
-    #undef __INT_LEAST64_WIDTH__
-    #define __INT_LEAST64_WIDTH__ 64
-    #undef __INT_LEAST8_FMTd__
-    #define __INT_LEAST8_FMTd__ "hhd"
-    #undef __INT_LEAST8_FMTi__
-    #define __INT_LEAST8_FMTi__ "hhi"
-    #undef __INT_LEAST8_MAX__
-    #define __INT_LEAST8_MAX__ 127
-    #undef __INT_LEAST8_TYPE__
-    #define __INT_LEAST8_TYPE__ signed char
-    #undef __INT_LEAST8_WIDTH__
-    #define __INT_LEAST8_WIDTH__ 8
-    #undef __INT_MAX__
-    #define __INT_MAX__ 2147483647
-    #undef __INT_WIDTH__
-    #define __INT_WIDTH__ 32
-    #undef __LDBL_DECIMAL_DIG__
-    #define __LDBL_DECIMAL_DIG__ 21
-    #undef __LDBL_DENORM_MIN__
-    #define __LDBL_DENORM_MIN__ 3.64519953188247460253e-4951L
-    #undef __LDBL_DIG__
-    #define __LDBL_DIG__ 18
-    #undef __LDBL_EPSILON__
-    #define __LDBL_EPSILON__ 1.08420217248550443401e-19L
-    #undef __LDBL_HAS_DENORM__
-    #define __LDBL_HAS_DENORM__ 1
-    #undef __LDBL_HAS_INFINITY__
-    #define __LDBL_HAS_INFINITY__ 1
-    #undef __LDBL_HAS_QUIET_NAN__
-    #define __LDBL_HAS_QUIET_NAN__ 1
-    #undef __LDBL_MANT_DIG__
-    #define __LDBL_MANT_DIG__ 64
-    #undef __LDBL_MAX_10_EXP__
-    #define __LDBL_MAX_10_EXP__ 4932
-    #undef __LDBL_MAX_EXP__
-    #define __LDBL_MAX_EXP__ 16384
-    #undef __LDBL_MAX__
-    #define __LDBL_MAX__ 1.18973149535723176502e+4932L
-    #undef __LDBL_MIN_10_EXP__
-    #define __LDBL_MIN_10_EXP__ (-4931)
-    #undef __LDBL_MIN_EXP__
-    #define __LDBL_MIN_EXP__ (-16381)
-    #undef __LDBL_MIN__
-    #define __LDBL_MIN__ 3.36210314311209350626e-4932L
-    #undef __LITTLE_ENDIAN__
-    #define __LITTLE_ENDIAN__ 1
-    #undef __LLONG_WIDTH__
-    #define __LLONG_WIDTH__ 64
-    #undef __LONG_LONG_MAX__
-    #define __LONG_LONG_MAX__ 9223372036854775807LL
-    #undef __LONG_MAX__
-    #define __LONG_MAX__ 9223372036854775807L
-    #undef __LONG_WIDTH__
-    #define __LONG_WIDTH__ 64
-    #undef __LP64__
-    #define __LP64__ 1
-    #undef __MMX__
-    #define __MMX__ 1
-    #undef __NO_INLINE__
-    #define __NO_INLINE__ 1
-    #undef __NO_MATH_INLINES
-    #define __NO_MATH_INLINES 1
-    #undef __OBJC_BOOL_IS_BOOL
-    #define __OBJC_BOOL_IS_BOOL 0
-    #undef __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES
-    #define __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES 3
-    #undef __OPENCL_MEMORY_SCOPE_DEVICE
-    #define __OPENCL_MEMORY_SCOPE_DEVICE 2
-    #undef __OPENCL_MEMORY_SCOPE_SUB_GROUP
-    #define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4
-    #undef __OPENCL_MEMORY_SCOPE_WORK_GROUP
-    #define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1
-    #undef __OPENCL_MEMORY_SCOPE_WORK_ITEM
-    #define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0
-    #undef __ORDER_BIG_ENDIAN__
-    #define __ORDER_BIG_ENDIAN__ 4321
-    #undef __ORDER_LITTLE_ENDIAN__
-    #define __ORDER_LITTLE_ENDIAN__ 1234
-    #undef __ORDER_PDP_ENDIAN__
-    #define __ORDER_PDP_ENDIAN__ 3412
-    #undef __POINTER_WIDTH__
-    #define __POINTER_WIDTH__ 64
-    #undef __PRAGMA_REDEFINE_EXTNAME
-    #define __PRAGMA_REDEFINE_EXTNAME 1
-    #undef __PTRDIFF_FMTd__
-    #define __PTRDIFF_FMTd__ "ld"
-    #undef __PTRDIFF_FMTi__
-    #define __PTRDIFF_FMTi__ "li"
-    #undef __PTRDIFF_MAX__
-    #define __PTRDIFF_MAX__ 9223372036854775807L
-    #undef __PTRDIFF_TYPE__
-    #define __PTRDIFF_TYPE__ long int
-    #undef __PTRDIFF_WIDTH__
-    #define __PTRDIFF_WIDTH__ 64
-    #undef __REGISTER_PREFIX__
-    #define __REGISTER_PREFIX__
-    #undef __SCHAR_MAX__
-    #define __SCHAR_MAX__ 127
-    #undef __SEG_FS
-    #define __SEG_FS 1
-    #undef __SEG_GS
-    #define __SEG_GS 1
-    #undef __SHRT_MAX__
-    #define __SHRT_MAX__ 32767
-    #undef __SHRT_WIDTH__
-    #define __SHRT_WIDTH__ 16
-    #undef __SIG_ATOMIC_MAX__
-    #define __SIG_ATOMIC_MAX__ 2147483647
-    #undef __SIG_ATOMIC_WIDTH__
-    #define __SIG_ATOMIC_WIDTH__ 32
-    #undef __SIZEOF_DOUBLE__
-    #define __SIZEOF_DOUBLE__ 8
-    #undef __SIZEOF_FLOAT__
-    #define __SIZEOF_FLOAT__ 4
-    #undef __SIZEOF_INT128__
-    #define __SIZEOF_INT128__ 16
-    #undef __SIZEOF_INT__
-    #define __SIZEOF_INT__ 4
-    #undef __SIZEOF_LONG_DOUBLE__
-    #define __SIZEOF_LONG_DOUBLE__ 16
-    #undef __SIZEOF_LONG_LONG__
-    #define __SIZEOF_LONG_LONG__ 8
-    #undef __SIZEOF_LONG__
-    #define __SIZEOF_LONG__ 8
-    #undef __SIZEOF_POINTER__
-    #define __SIZEOF_POINTER__ 8
-    #undef __SIZEOF_PTRDIFF_T__
-    #define __SIZEOF_PTRDIFF_T__ 8
-    #undef __SIZEOF_SHORT__
-    #define __SIZEOF_SHORT__ 2
-    #undef __SIZEOF_SIZE_T__
-    #define __SIZEOF_SIZE_T__ 8
-    #undef __SIZEOF_WCHAR_T__
-    #define __SIZEOF_WCHAR_T__ 4
-    #undef __SIZEOF_WINT_T__
-    #define __SIZEOF_WINT_T__ 4
-    #undef __SIZE_FMTX__
-    #define __SIZE_FMTX__ "lX"
-    #undef __SIZE_FMTo__
-    #define __SIZE_FMTo__ "lo"
-    #undef __SIZE_FMTu__
-    #define __SIZE_FMTu__ "lu"
-    #undef __SIZE_FMTx__
-    #define __SIZE_FMTx__ "lx"
-    #undef __SIZE_MAX__
-    #define __SIZE_MAX__ 18446744073709551615UL
-    #undef __SIZE_TYPE__
-    #define __SIZE_TYPE__ long unsigned int
-    #undef __SIZE_WIDTH__
-    #define __SIZE_WIDTH__ 64
-    #undef __SSE2_MATH__
-    #define __SSE2_MATH__ 1
-    #undef __SSE2__
-    #define __SSE2__ 1
-    #undef __SSE_MATH__
-    #define __SSE_MATH__ 1
-    #undef __SSE__
-    #define __SSE__ 1
-    #undef __UINT16_C_SUFFIX__
-    #define __UINT16_C_SUFFIX__
-    #undef __UINT16_FMTX__
-    #define __UINT16_FMTX__ "hX"
-    #undef __UINT16_FMTo__
-    #define __UINT16_FMTo__ "ho"
-    #undef __UINT16_FMTu__
-    #define __UINT16_FMTu__ "hu"
-    #undef __UINT16_FMTx__
-    #define __UINT16_FMTx__ "hx"
-    #undef __UINT16_MAX__
-    #define __UINT16_MAX__ 65535
-    #undef __UINT16_TYPE__
-    #define __UINT16_TYPE__ unsigned short
-    #undef __UINT32_C_SUFFIX__
-    #define __UINT32_C_SUFFIX__ U
-    #undef __UINT32_FMTX__
-    #define __UINT32_FMTX__ "X"
-    #undef __UINT32_FMTo__
-    #define __UINT32_FMTo__ "o"
-    #undef __UINT32_FMTu__
-    #define __UINT32_FMTu__ "u"
-    #undef __UINT32_FMTx__
-    #define __UINT32_FMTx__ "x"
-    #undef __UINT32_MAX__
-    #define __UINT32_MAX__ 4294967295U
-    #undef __UINT32_TYPE__
-    #define __UINT32_TYPE__ unsigned int
-    #undef __UINT64_C_SUFFIX__
-    #define __UINT64_C_SUFFIX__ UL
-    #undef __UINT64_FMTX__
-    #define __UINT64_FMTX__ "lX"
-    #undef __UINT64_FMTo__
-    #define __UINT64_FMTo__ "lo"
-    #undef __UINT64_FMTu__
-    #define __UINT64_FMTu__ "lu"
-    #undef __UINT64_FMTx__
-    #define __UINT64_FMTx__ "lx"
-    #undef __UINT64_MAX__
-    #define __UINT64_MAX__ 18446744073709551615UL
-    #undef __UINT64_TYPE__
-    #define __UINT64_TYPE__ long unsigned int
-    #undef __UINT8_C_SUFFIX__
-    #define __UINT8_C_SUFFIX__
-    #undef __UINT8_FMTX__
-    #define __UINT8_FMTX__ "hhX"
-    #undef __UINT8_FMTo__
-    #define __UINT8_FMTo__ "hho"
-    #undef __UINT8_FMTu__
-    #define __UINT8_FMTu__ "hhu"
-    #undef __UINT8_FMTx__
-    #define __UINT8_FMTx__ "hhx"
-    #undef __UINT8_MAX__
-    #define __UINT8_MAX__ 255
-    #undef __UINT8_TYPE__
-    #define __UINT8_TYPE__ unsigned char
-    #undef __UINTMAX_C_SUFFIX__
-    #define __UINTMAX_C_SUFFIX__ UL
-    #undef __UINTMAX_FMTX__
-    #define __UINTMAX_FMTX__ "lX"
-    #undef __UINTMAX_FMTo__
-    #define __UINTMAX_FMTo__ "lo"
-    #undef __UINTMAX_FMTu__
-    #define __UINTMAX_FMTu__ "lu"
-    #undef __UINTMAX_FMTx__
-    #define __UINTMAX_FMTx__ "lx"
-    #undef __UINTMAX_MAX__
-    #define __UINTMAX_MAX__ 18446744073709551615UL
-    #undef __UINTMAX_TYPE__
-    #define __UINTMAX_TYPE__ long unsigned int
-    #undef __UINTMAX_WIDTH__
-    #define __UINTMAX_WIDTH__ 64
-    #undef __UINTPTR_FMTX__
-    #define __UINTPTR_FMTX__ "lX"
-    #undef __UINTPTR_FMTo__
-    #define __UINTPTR_FMTo__ "lo"
-    #undef __UINTPTR_FMTu__
-    #define __UINTPTR_FMTu__ "lu"
-    #undef __UINTPTR_FMTx__
-    #define __UINTPTR_FMTx__ "lx"
-    #undef __UINTPTR_MAX__
-    #define __UINTPTR_MAX__ 18446744073709551615UL
-    #undef __UINTPTR_TYPE__
-    #define __UINTPTR_TYPE__ long unsigned int
-    #undef __UINTPTR_WIDTH__
-    #define __UINTPTR_WIDTH__ 64
-    #undef __UINT_FAST16_FMTX__
-    #define __UINT_FAST16_FMTX__ "hX"
-    #undef __UINT_FAST16_FMTo__
-    #define __UINT_FAST16_FMTo__ "ho"
-    #undef __UINT_FAST16_FMTu__
-    #define __UINT_FAST16_FMTu__ "hu"
-    #undef __UINT_FAST16_FMTx__
-    #define __UINT_FAST16_FMTx__ "hx"
-    #undef __UINT_FAST16_MAX__
-    #define __UINT_FAST16_MAX__ 65535
-    #undef __UINT_FAST16_TYPE__
-    #define __UINT_FAST16_TYPE__ unsigned short
-    #undef __UINT_FAST32_FMTX__
-    #define __UINT_FAST32_FMTX__ "X"
-    #undef __UINT_FAST32_FMTo__
-    #define __UINT_FAST32_FMTo__ "o"
-    #undef __UINT_FAST32_FMTu__
-    #define __UINT_FAST32_FMTu__ "u"
-    #undef __UINT_FAST32_FMTx__
-    #define __UINT_FAST32_FMTx__ "x"
-    #undef __UINT_FAST32_MAX__
-    #define __UINT_FAST32_MAX__ 4294967295U
-    #undef __UINT_FAST32_TYPE__
-    #define __UINT_FAST32_TYPE__ unsigned int
-    #undef __UINT_FAST64_FMTX__
-    #define __UINT_FAST64_FMTX__ "lX"
-    #undef __UINT_FAST64_FMTo__
-    #define __UINT_FAST64_FMTo__ "lo"
-    #undef __UINT_FAST64_FMTu__
-    #define __UINT_FAST64_FMTu__ "lu"
-    #undef __UINT_FAST64_FMTx__
-    #define __UINT_FAST64_FMTx__ "lx"
-    #undef __UINT_FAST64_MAX__
-    #define __UINT_FAST64_MAX__ 18446744073709551615UL
-    #undef __UINT_FAST64_TYPE__
-    #define __UINT_FAST64_TYPE__ long unsigned int
-    #undef __UINT_FAST8_FMTX__
-    #define __UINT_FAST8_FMTX__ "hhX"
-    #undef __UINT_FAST8_FMTo__
-    #define __UINT_FAST8_FMTo__ "hho"
-    #undef __UINT_FAST8_FMTu__
-    #define __UINT_FAST8_FMTu__ "hhu"
-    #undef __UINT_FAST8_FMTx__
-    #define __UINT_FAST8_FMTx__ "hhx"
-    #undef __UINT_FAST8_MAX__
-    #define __UINT_FAST8_MAX__ 255
-    #undef __UINT_FAST8_TYPE__
-    #define __UINT_FAST8_TYPE__ unsigned char
-    #undef __UINT_LEAST16_FMTX__
-    #define __UINT_LEAST16_FMTX__ "hX"
-    #undef __UINT_LEAST16_FMTo__
-    #define __UINT_LEAST16_FMTo__ "ho"
-    #undef __UINT_LEAST16_FMTu__
-    #define __UINT_LEAST16_FMTu__ "hu"
-    #undef __UINT_LEAST16_FMTx__
-    #define __UINT_LEAST16_FMTx__ "hx"
-    #undef __UINT_LEAST16_MAX__
-    #define __UINT_LEAST16_MAX__ 65535
-    #undef __UINT_LEAST16_TYPE__
-    #define __UINT_LEAST16_TYPE__ unsigned short
-    #undef __UINT_LEAST32_FMTX__
-    #define __UINT_LEAST32_FMTX__ "X"
-    #undef __UINT_LEAST32_FMTo__
-    #define __UINT_LEAST32_FMTo__ "o"
-    #undef __UINT_LEAST32_FMTu__
-    #define __UINT_LEAST32_FMTu__ "u"
-    #undef __UINT_LEAST32_FMTx__
-    #define __UINT_LEAST32_FMTx__ "x"
-    #undef __UINT_LEAST32_MAX__
-    #define __UINT_LEAST32_MAX__ 4294967295U
-    #undef __UINT_LEAST32_TYPE__
-    #define __UINT_LEAST32_TYPE__ unsigned int
-    #undef __UINT_LEAST64_FMTX__
-    #define __UINT_LEAST64_FMTX__ "lX"
-    #undef __UINT_LEAST64_FMTo__
-    #define __UINT_LEAST64_FMTo__ "lo"
-    #undef __UINT_LEAST64_FMTu__
-    #define __UINT_LEAST64_FMTu__ "lu"
-    #undef __UINT_LEAST64_FMTx__
-    #define __UINT_LEAST64_FMTx__ "lx"
-    #undef __UINT_LEAST64_MAX__
-    #define __UINT_LEAST64_MAX__ 18446744073709551615UL
-    #undef __UINT_LEAST64_TYPE__
-    #define __UINT_LEAST64_TYPE__ long unsigned int
-    #undef __UINT_LEAST8_FMTX__
-    #define __UINT_LEAST8_FMTX__ "hhX"
-    #undef __UINT_LEAST8_FMTo__
-    #define __UINT_LEAST8_FMTo__ "hho"
-    #undef __UINT_LEAST8_FMTu__
-    #define __UINT_LEAST8_FMTu__ "hhu"
-    #undef __UINT_LEAST8_FMTx__
-    #define __UINT_LEAST8_FMTx__ "hhx"
-    #undef __UINT_LEAST8_MAX__
-    #define __UINT_LEAST8_MAX__ 255
-    #undef __UINT_LEAST8_TYPE__
-    #define __UINT_LEAST8_TYPE__ unsigned char
-    #undef __USER_LABEL_PREFIX__
-    #define __USER_LABEL_PREFIX__
-    #undef __VERSION__
-    #define __VERSION__ "Clang 15.0.7"
-    #undef __WCHAR_MAX__
-    #define __WCHAR_MAX__ 2147483647
-    #undef __WCHAR_TYPE__
-    #define __WCHAR_TYPE__ int
-    #undef __WCHAR_WIDTH__
-    #define __WCHAR_WIDTH__ 32
-    #undef __WINT_MAX__
-    #define __WINT_MAX__ 2147483647
-    #undef __WINT_TYPE__
-    #define __WINT_TYPE__ int
-    #undef __WINT_WIDTH__
-    #define __WINT_WIDTH__ 32
-    #undef __amd64
-    #define __amd64 1
-    #undef __amd64__
-    #define __amd64__ 1
-    #undef __clang__
-    #define __clang__ 1
-    #undef __clang_literal_encoding__
-    #define __clang_literal_encoding__ "UTF-8"
-    #undef __clang_major__
-    #define __clang_major__ 15
-    #undef __clang_minor__
-    #define __clang_minor__ 0
-    #undef __clang_patchlevel__
-    #define __clang_patchlevel__ 7
-    #undef __clang_version__
-    #define __clang_version__ "15.0.7 "
-    #undef __clang_wide_literal_encoding__
-    #define __clang_wide_literal_encoding__ "UTF-32"
-    #undef __code_model_small__
-    #define __code_model_small__ 1
-    #undef __k8
-    #define __k8 1
-    #undef __k8__
-    #define __k8__ 1
-    #undef __llvm__
-    #define __llvm__ 1
-    #undef __seg_fs
-    #define __seg_fs __attribute__((address_space(257)))
-    #undef __seg_gs
-    #define __seg_gs __attribute__((address_space(256)))
-    #undef __tune_k8__
-    #define __tune_k8__ 1
-    #undef __x86_64
-    #define __x86_64 1
-    #undef __x86_64__
-    #define __x86_64__ 1
+  - --target=x86_64
 eof: (-1)
 errno:
-    e2big: '7'
-    eacces: '13'
-    eaddrinuse: '98'
-    eaddrnotavail: '99'
-    eafnosupport: '97'
-    eagain: '11'
-    ealready: '114'
-    ebade: '52'
-    ebadf: '9'
-    ebadfd: '77'
-    ebadmsg: '74'
-    ebadr: '53'
-    ebadrqc: '56'
-    ebadslt: '57'
-    ebusy: '16'
-    ecanceled: '125'
-    echild: '10'
-    echrng: '44'
-    ecomm: '70'
-    econnaborted: '103'
-    econnrefused: '111'
-    econnreset: '104'
-    edeadlk: '35'
-    edeadlock: '35'
-    edestaddrreq: '89'
-    edom: '33'
-    edquot: '122'
-    eexist: '17'
-    efault: '14'
-    efbig: '27'
-    ehostdown: '112'
-    ehostunreach: '113'
-    eidrm: '43'
-    eilseq: '84'
-    einprogress: '115'
-    eintr: '4'
-    einval: '22'
-    eio: '5'
-    eisconn: '106'
-    eisdir: '21'
-    eisnam: '120'
-    ekeyexpired: '127'
-    ekeyrejected: '129'
-    ekeyrevoked: '128'
-    el2hlt: '51'
-    el2nsync: '45'
-    el3hlt: '46'
-    el3rst: '47'
-    elibacc: '79'
-    elibbad: '80'
-    elibexec: '83'
-    elibmax: '82'
-    elibscn: '81'
-    eloop: '40'
-    emediumtype: '124'
-    emfile: '24'
-    emlink: '31'
-    emsgsize: '90'
-    emultihop: '72'
-    enametoolong: '36'
-    enetdown: '100'
-    enetreset: '102'
-    enetunreach: '101'
-    enfile: '23'
-    enobufs: '105'
-    enodata: '61'
-    enodev: '19'
-    enoent: '2'
-    enoexec: '8'
-    enokey: '126'
-    enolck: '37'
-    enolink: '67'
-    enomedium: '123'
-    enomem: '12'
-    enomsg: '42'
-    enonet: '64'
-    enopkg: '65'
-    enoprotoopt: '92'
-    enospc: '28'
-    enosr: '63'
-    enostr: '60'
-    enosys: '38'
-    enotblk: '15'
-    enotconn: '107'
-    enotdir: '20'
-    enotempty: '39'
-    enotrecoverable: '131'
-    enotsock: '88'
-    enotsup: '95'
-    enotty: '25'
-    enotuniq: '76'
-    enxio: '6'
-    eopnotsupp: '95'
-    eoverflow: '75'
-    eownerdead: '130'
-    eperm: '1'
-    epfnosupport: '96'
-    epipe: '32'
-    eproto: '71'
-    eprotonosupport: '93'
-    eprototype: '91'
-    erange: '34'
-    eremchg: '78'
-    eremote: '66'
-    eremoteio: '121'
-    erestart: '85'
-    erofs: '30'
-    eshutdown: '108'
-    esocktnosupport: '94'
-    espipe: '29'
-    esrch: '3'
-    estale: '116'
-    estrpipe: '86'
-    etime: '62'
-    etimedout: '110'
-    etxtbsy: '26'
-    euclean: '117'
-    eunatch: '49'
-    eusers: '87'
-    ewouldblock: '11'
-    exdev: '18'
-    exfull: '54'
+  e2big: '7'
+  eacces: '13'
+  eaddrinuse: '98'
+  eaddrnotavail: '99'
+  eafnosupport: '97'
+  eagain: '11'
+  ealready: '114'
+  ebade: '52'
+  ebadf: '9'
+  ebadfd: '77'
+  ebadmsg: '74'
+  ebadr: '53'
+  ebadrqc: '56'
+  ebadslt: '57'
+  ebusy: '16'
+  ecanceled: '125'
+  echild: '10'
+  echrng: '44'
+  ecomm: '70'
+  econnaborted: '103'
+  econnrefused: '111'
+  econnreset: '104'
+  edeadlk: '35'
+  edeadlock: '35'
+  edestaddrreq: '89'
+  edom: '33'
+  edquot: '122'
+  eexist: '17'
+  efault: '14'
+  efbig: '27'
+  ehostdown: '112'
+  ehostunreach: '113'
+  eidrm: '43'
+  eilseq: '84'
+  einprogress: '115'
+  eintr: '4'
+  einval: '22'
+  eio: '5'
+  eisconn: '106'
+  eisdir: '21'
+  eisnam: '120'
+  ekeyexpired: '127'
+  ekeyrejected: '129'
+  ekeyrevoked: '128'
+  el2hlt: '51'
+  el2nsync: '45'
+  el3hlt: '46'
+  el3rst: '47'
+  elibacc: '79'
+  elibbad: '80'
+  elibexec: '83'
+  elibmax: '82'
+  elibscn: '81'
+  eloop: '40'
+  emediumtype: '124'
+  emfile: '24'
+  emlink: '31'
+  emsgsize: '90'
+  emultihop: '72'
+  enametoolong: '36'
+  enetdown: '100'
+  enetreset: '102'
+  enetunreach: '101'
+  enfile: '23'
+  enobufs: '105'
+  enodata: '61'
+  enodev: '19'
+  enoent: '2'
+  enoexec: '8'
+  enokey: '126'
+  enolck: '37'
+  enolink: '67'
+  enomedium: '123'
+  enomem: '12'
+  enomsg: '42'
+  enonet: '64'
+  enopkg: '65'
+  enoprotoopt: '92'
+  enospc: '28'
+  enosr: '63'
+  enostr: '60'
+  enosys: '38'
+  enotblk: '15'
+  enotconn: '107'
+  enotdir: '20'
+  enotempty: '39'
+  enotrecoverable: '131'
+  enotsock: '88'
+  enotsup: '95'
+  enotty: '25'
+  enotuniq: '76'
+  enxio: '6'
+  eopnotsupp: '95'
+  eoverflow: '75'
+  eownerdead: '130'
+  eperm: '1'
+  epfnosupport: '96'
+  epipe: '32'
+  eproto: '71'
+  eprotonosupport: '93'
+  eprototype: '91'
+  erange: '34'
+  eremchg: '78'
+  eremote: '66'
+  eremoteio: '121'
+  erestart: '85'
+  erofs: '30'
+  eshutdown: '108'
+  esocktnosupport: '94'
+  espipe: '29'
+  esrch: '3'
+  estale: '116'
+  estrpipe: '86'
+  etime: '62'
+  etimedout: '110'
+  etxtbsy: '26'
+  euclean: '117'
+  eunatch: '49'
+  eusers: '87'
+  ewouldblock: '11'
+  exdev: '18'
+  exfull: '54'
 filename_max: '4096'
 fopen_max: '16'
 has__builtin_va_list: true
@@ -858,7 +149,7 @@ int_fast8_t: signed char
 intptr_t: long
 l_tmpnam: '20'
 little_endian: true
-machdep_name: custom_machdep
+machdep_name: anonymous_machdep
 mb_cur_max: ((size_t)16)
 nsig: (64 + 1)
 path_max: '4096'
@@ -886,7 +177,6 @@ uint_fast32_t: unsigned long
 uint_fast64_t: unsigned long
 uint_fast8_t: unsigned char
 uintptr_t: unsigned long
-version: clang version 15.0.7
 wchar_t: int
 weof: (0xffffffffu)
 wint_t: int
diff --git a/tests/fc_script/test_machdep.i b/tests/fc_script/test_machdep.i
index 565fb9ba34fadd6dc9f8fde75bf9e2265f24b70c..9c1a9f629ad710d747394afb657f9fc7ed4e5efb 100644
--- a/tests/fc_script/test_machdep.i
+++ b/tests/fc_script/test_machdep.i
@@ -1,7 +1,7 @@
 /* run.config
    NOFRAMAC: Just test the generation of a custom machdep with the installed script.
    COMMENT: No C code gets analyzed there. File is empty on purpose
-   ENABLED_IF: %{bin-available:clang}
+   ENABLED_IF: (and %{bin-available:clang} %{bin-available:yq})
    FILTER: sed -e '/^version:/d'
-   EXECNOW: LOG custom_machdep.yaml LOG make_machdep.err.log PTESTS_TESTING=1 %{bin:frama-c-script} make-machdep --compiler clang --cpp-arch-flags='--target=x86_64' -o custom_machdep.yaml 2> make_machdep.err.log
+   EXECNOW: LOG custom_machdep.yaml LOG make_machdep.err.log PTESTS_TESTING=1 %{bin:frama-c-script} make-machdep --compiler clang --cpp-arch-flags='--target=x86_64' | yq -Y 'del(.version)|del(.custom_defs)' > custom_machdep.yaml 2> make_machdep.err.log
 */