Remove last traces of discard_all_inferiors

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

diff --git a/bfd/cpu-iq2000.c b/bfd/cpu-iq2000.c
index c3331db05be56fc5d2f4d491cf40869d4793a3d8..068cb07c70e5a9053a18c282d96a18539ffbc129 100644 (file)
--- a/bfd/cpu-iq2000.c
+++ b/bfd/cpu-iq2000.c
@@ -1,56 +1,48 @@
 /* BFD support for the Vitesse IQ2000 processor.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
-static const bfd_arch_info_type arch_info_struct[] =
-{
-  {
-    32,                                /* bits per word */
-    32,                                /* bits per address */
-    8,                         /* bits per byte */
-    bfd_arch_iq2000,           /* architecture */
-    bfd_mach_iq10,             /* machine */
-    "iq2000",                  /* architecture name */
-    "iq10",                    /* printable name */
-    3,                         /* section align power */
-    FALSE,                     /* the default ? */
-    bfd_default_compatible,    /* architecture comparison fn */
-    bfd_default_scan,          /* string to architecture convert fn */
-    NULL                       /* next in list */
+#define N(NUMBER, PRINT, DEFAULT, NEXT)                        \
+  {                                                    \
+    32,         /* Bits in a word.  */                 \
+    32,         /* Bits in an address.  */             \
+    8,         /* Bits in a byte.  */                  \
+    bfd_arch_iq2000,                                   \
+    NUMBER,                                            \
+    "iq2000",                                          \
+    PRINT,                                             \
+    3,         /* 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 =
+  N (bfd_mach_iq10, "iq10", FALSE, NULL);
 
 const bfd_arch_info_type bfd_iq2000_arch =
-{
-  32,                          /* bits per word */
-  32,                          /* bits per address */
-  8,                           /* bits per byte */
-  bfd_arch_iq2000,             /* architecture */
-  bfd_mach_iq2000,             /* machine */
-  "iq2000",                    /* architecture name */
-  "iq2000",                    /* printable name */
-  3,                           /* section align power */
-  TRUE,                                /* the default ? */
-  bfd_default_compatible,      /* architecture comparison fn */
-  bfd_default_scan,            /* string to architecture convert fn */
-  &arch_info_struct[0],                /* next in list */
-};
+  N (bfd_mach_iq2000, "iq2000", TRUE, &arch_info_struct);
+