X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Fcpu-mt.c;h=f1eecf4e19017da7723276540996a87d5ba4702c;hb=d942d8db12adf4c9e5c7d9ed6496a779ece7149e;hp=614a80421c1099348b7fdf34fc718da08474b391;hpb=827041555ac443bd57340060f3e034fd7b199dd8;p=binutils-gdb.git

diff --git a/bfd/cpu-mt.c b/bfd/cpu-mt.c
index 614a80421c1..f1eecf4e190 100644
--- a/bfd/cpu-mt.c
+++ b/bfd/cpu-mt.c
@@ -1,5 +1,5 @@
 /* BFD support for the Morpho Technologies MT processor.
-   Copyright (C) 2001-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2022 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -22,54 +22,31 @@
 #include "bfd.h"
 #include "libbfd.h"
 
-const bfd_arch_info_type arch_info_struct[] =
+#define N(NUMBER, PRINT, DEFAULT, NEXT)			\
+  {							\
+    32,   /* Bits in a word.  */			\
+    32,   /* Bits in an address.  */			\
+    8,	  /* Bits in a byte.  */			\
+    bfd_arch_mt,					\
+    NUMBER,						\
+    "mt",						\
+    PRINT,						\
+    1,		/* 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.  */ \
+  }
+
+const bfd_arch_info_type arch_info_struct[2] =
 {
-{
-  32,				/* Bits per word - not really true.  */
-  32,				/* Bits per address.  */
-  8,				/* Bits per byte.  */
-  bfd_arch_mt,			/* Architecture.  */
-  bfd_mach_mrisc2,		/* Machine.  */
-  "mt",				/* Architecture name.  */
-  "ms1-003",			/* Printable name.  */
-  1,				/* Section align power.  */
-  FALSE,			/* The default ?  */
-  bfd_default_compatible,	/* Architecture comparison fn.  */
-  bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
-  &arch_info_struct[1]		/* Next in list.  */
-},
-{
-  32,				/* Bits per word - not really true.  */
-  32,				/* Bits per address.  */
-  8,				/* Bits per byte.  */
-  bfd_arch_mt,			/* Architecture.  */
-  bfd_mach_ms2,			/* Machine.  */
-  "mt",				/* Architecture name.  */
-  "ms2",			/* Printable name.  */
-  1,				/* Section align power.  */
-  FALSE,			/* The default ?  */
-  bfd_default_compatible,	/* Architecture comparison fn.  */
-  bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
-  NULL				/* Next in list.  */
-},
+  N (bfd_mach_mrisc2, "ms1-003", false, arch_info_struct + 1),
+  N (bfd_mach_ms2,    "ms2",     false, NULL)
 };
 
 const bfd_arch_info_type bfd_mt_arch =
-{
-  32,				/* Bits per word - not really true.  */
-  32,				/* Bits per address.  */
-  8,				/* Bits per byte.  */
-  bfd_arch_mt,			/* Architecture.  */
-  bfd_mach_ms1,			/* Machine.  */
-  "mt",				/* Architecture name.  */
-  "ms1",			/* Printable name.  */
-  1,				/* Section align power.  */
-  TRUE,				/* The default ?  */
-  bfd_default_compatible,	/* Architecture comparison fn.  */
-  bfd_default_scan,		/* String to architecture convert fn.  */
-  bfd_arch_default_fill,	/* Default fill.  */
-  &arch_info_struct[0]		/* Next in list.  */
-};
+  N (bfd_mach_ms1,    "ms1",     true, arch_info_struct);
+