The code at the start of init_target() already take care
of making the arch variants match their bitness. It's thus
not possible, when setting the type of [u]int32, to have
mips64, ppc64, riscv64 or sparc64 with arch_m64 different
than ARCH_LP64.
So, remove the unneeded checks.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx>
---
lib.c | 23 +++++++++--------------
target.c | 4 ----
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/lib.c b/lib.c
index 350d881a9..57d2738bf 100644
--- a/lib.c
+++ b/lib.c
@@ -1494,8 +1494,7 @@ static void predefined_macros(void)
predefine("__m68k__", 1, "1");
break;
case MACH_MIPS64:
- if (arch_m64 == ARCH_LP64)
- predefine("__mips64", 1, "64");
+ predefine("__mips64", 1, "64");
/* fall-through */
case MACH_MIPS32:
predefine("__mips__", 1, "1");
@@ -1505,11 +1504,9 @@ static void predefined_macros(void)
predefine("_MIPS_SZPTR", 1, "%d", ptr_ctype.bit_size);
break;
case MACH_PPC64:
- if (arch_m64 == ARCH_LP64) {
- predefine("__powerpc64__", 1, "1");
- predefine("__ppc64__", 1, "1");
- predefine("__PPC64__", 1, "1");
- }
+ predefine("__powerpc64__", 1, "1");
+ predefine("__ppc64__", 1, "1");
+ predefine("__PPC64__", 1, "1");
/* fall-through */
case MACH_PPC32:
predefine("__powerpc__", 1, "1");
@@ -1531,13 +1528,11 @@ static void predefined_macros(void)
predefine("__s390__", 1, "1");
break;
case MACH_SPARC64:
- if (arch_m64 == ARCH_LP64) {
- predefine("__sparc_v9__", 1, "1");
- predefine("__sparcv9__", 1, "1");
- predefine("__sparcv9", 1, "1");
- predefine("__sparc64__", 1, "1");
- predefine("__arch64__", 1, "1");
- }
+ predefine("__sparc_v9__", 1, "1");
+ predefine("__sparcv9__", 1, "1");
+ predefine("__sparcv9", 1, "1");
+ predefine("__sparc64__", 1, "1");
+ predefine("__arch64__", 1, "1");
/* fall-through */
case MACH_SPARC32:
predefine("__sparc__", 1, "1");
diff --git a/target.c b/target.c
index bdda7ec7f..146c4125d 100644
--- a/target.c
+++ b/target.c
@@ -105,10 +105,6 @@ void init_target(void)
}
switch (arch_mach) {
- case MACH_MIPS64:
- if (arch_m64 == ARCH_LP64)
- break;
- /* fall through */
case MACH_M68K:
case MACH_SPARC32:
case MACH_PPC32:
--
2.24.0
