Revert "bfd: aarch64: fix word and arrdess size declaration in ilp32 mode"

This reverts commit a02c3512655cc2c8ad68e4b656959b7d284acc7d.

diff --git a/bfd/cpu-aarch64.c b/bfd/cpu-aarch64.c
index 1adc67017655e4a0505b36b237afd0f588977f2d..596d24190b589d8380b2ee3ff5855cbf71757f67 100644 (file)
--- a/bfd/cpu-aarch64.c
+++ b/bfd/cpu-aarch64.c
@@ -100,16 +100,16 @@ scan (const struct bfd_arch_info *info, const char *string)
   return FALSE;
 }
 
-#define N(NUMBER, PRINT, WORDSIZE, DEFAULT, NEXT)              \
-  { WORDSIZE, WORDSIZE, 8, bfd_arch_aarch64, NUMBER,           \
+#define N(NUMBER, PRINT, DEFAULT, NEXT)                                \
+  { 64, 64, 8, bfd_arch_aarch64, NUMBER,                       \
     "aarch64", PRINT, 4, DEFAULT, compatible, scan,            \
     bfd_arch_default_fill, NEXT }
 
 static const bfd_arch_info_type bfd_aarch64_arch_ilp32 =
-  N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", 32, FALSE, NULL);
+  N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", FALSE, NULL);
 
 const bfd_arch_info_type bfd_aarch64_arch =
-  N (0, "aarch64", 64, TRUE, &bfd_aarch64_arch_ilp32);
+  N (0, "aarch64", TRUE, &bfd_aarch64_arch_ilp32);
 
 bfd_boolean
 bfd_is_aarch64_special_symbol_name (const char *name, int type)