Introduce basic_safe_range

[deliverable/binutils-gdb.git] / bfd / cpu-ft32.c

diff --git a/bfd/cpu-ft32.c b/bfd/cpu-ft32.c
index 5b51b7abf239bfc69bfbb53bd0c2b118cb46433f..3c33e3fdf02b5d99eb94cc51cb4cb0b8514686d9 100644 (file)
--- a/bfd/cpu-ft32.c
+++ b/bfd/cpu-ft32.c
@@ -22,54 +22,31 @@
 #include "bfd.h"
 #include "libbfd.h"
 
+#define N(NUMBER, PRINT, DEFAULT, NEXT)                        \
+  {                                                    \
+    32,        /* Bits in a word.  */                  \
+    32,        /* Bits in an address.  */              \
+    8,        /* Bits in a byte.  */                   \
+    bfd_arch_ft32,                                     \
+    NUMBER,                                            \
+    "ft32",                                            \
+    PRINT,                                             \
+    2,         /* Section alignment power.  */         \
+    DEFAULT,                                           \
+    bfd_default_compatible,                            \
+    bfd_default_scan,                                  \
+    bfd_arch_default_fill,                             \
+    NEXT,                                              \
+    0 /* Maximum offset of a reloc from the start of an insn.  */ \
+  }
+
 
 static const bfd_arch_info_type arch_info_struct[] =
-  {
-    {
-      32,              /* 32 bits in a word.  */
-      32,              /* 32 bits in an address.  */
-      8,               /*  8 bits in a byte.  */
-      bfd_arch_ft32,   /* enum bfd_architecture arch.  */
-      bfd_mach_ft32,
-      "ft32",          /* Arch name.  */
-      "ft32",          /* Printable name.  */
-      2,               /* Unsigned int section alignment power.  */
-      FALSE,           /* The one and only.  */
-      bfd_default_compatible,
-      bfd_default_scan,
-      bfd_arch_default_fill,
-      &arch_info_struct[1],
-    },
-    {
-      32,              /* 32 bits in a word.  */
-      32,              /* 32 bits in an address.  */
-      8,               /*  8 bits in a byte.  */
-      bfd_arch_ft32,   /* enum bfd_architecture arch.  */
-      bfd_mach_ft32b,
-      "ft32b",         /* Arch name.  */
-      "ft32b",         /* Printable name.  */
-      2,               /* Unsigned int section alignment power.  */
-      FALSE,           /* The one and only.  */
-      bfd_default_compatible,
-      bfd_default_scan,
-      bfd_arch_default_fill,
-      0,
-    },
-  };
+{
+  N (bfd_mach_ft32, "ft32", FALSE, &arch_info_struct[1]),
+  N (bfd_mach_ft32b, "ft32b", FALSE, NULL)
+};
 
 const bfd_arch_info_type bfd_ft32_arch =
-  {
-    32,                        /* 32 bits in a word.  */
-    32,                        /* 32 bits in an address.  */
-    8,                 /*  8 bits in a byte.  */
-    bfd_arch_ft32,     /* enum bfd_architecture arch.  */
-    bfd_mach_ft32,
-    "ft32",            /* Arch name.  */
-    "ft32",            /* Printable name.  */
-    2,                 /* Unsigned int section alignment power.  */
-    TRUE,              /* The one and only.  */
-    bfd_default_compatible,
-    bfd_default_scan,
-    bfd_arch_default_fill,
-    arch_info_struct,
-  };
+  N (bfd_mach_ft32, "ft32", TRUE, arch_info_struct);
+