X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-ft32.c;h=3c33e3fdf02b5d99eb94cc51cb4cb0b8514686d9;hb=ed48ec2e6ec5514f01b9b3a810d6ddf39651114b;hp=033720b18f1c8e43fa5abc247e16a1de332bfa37;hpb=81b42bcab16f4462eb4c91db2cf09cd76e17402e;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-ft32.c b/bfd/cpu-ft32.c
index 033720b18f..3c33e3fdf0 100644
--- a/bfd/cpu-ft32.c
+++ b/bfd/cpu-ft32.c
@@ -1,5 +1,5 @@
 /* BFD support for the ft32 processor.
-   Copyright (C) 2013-2017 Free Software Foundation, Inc.
+   Copyright (C) 2013-2019 Free Software Foundation, Inc.
    Written by FTDI (support@ftdichip.com)
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -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);
+