Revert commit 240d6706c6a2

[binutils-gdb.git] / bfd / cpu-d10v.c

diff --git a/bfd/cpu-d10v.c b/bfd/cpu-d10v.c
index 18061a1379766748b531e30bab97831a0051b917..92949971dee972799cf647fb8b757d3dcb097c89 100644 (file)
--- a/bfd/cpu-d10v.c
+++ b/bfd/cpu-d10v.c
@@ -1,12 +1,12 @@
 /* BFD support for the D10V processor
 /* BFD support for the D10V processor

-   Copyright 1996, 1999, 2000, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2022 Free Software Foundation, Inc.

    Contributed by Martin Hunt (hunt@cygnus.com).
 
    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
    Contributed by Martin Hunt (hunt@cygnus.com).
 
    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
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -19,54 +19,33 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 
 #include "libbfd.h"
 

+#define N(NUMBER, PRINT, DEFAULT, NEXT)                        \
+  {                                                    \
+    16,         /* Bits in a word.  */                 \
+    18,         /* Bits in an address.  */             \
+    8,         /* Bits in a byte.  */                  \
+    bfd_arch_d10v,                                     \
+    NUMBER,                                            \
+    "d10v",                                            \
+    PRINT,                                             \
+    4,         /* 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 d10v_ts3_info =
 static const bfd_arch_info_type d10v_ts3_info =

-{
-  16,  /* 16 bits in a word.  */
-  16,  /* 16 bits in an address.  */
-  8,   /* 8 bits in a byte.  */
-  bfd_arch_d10v,
-  bfd_mach_d10v_ts3,
-  "d10v",
-  "d10v:ts3",
-  4,   /* Section alignment power.  */
-  FALSE,
-  bfd_default_compatible,
-  bfd_default_scan,
-  0,
-};
+  N (bfd_mach_d10v_ts3, "d10v:ts3", false, NULL);

 
 static const bfd_arch_info_type d10v_ts2_info =
 
 static const bfd_arch_info_type d10v_ts2_info =

-{
-  16,  /* 16 bits in a word.  */
-  16,  /* 16 bits in an address.  */
-  8,   /* 8 bits in a byte.  */
-  bfd_arch_d10v,
-  bfd_mach_d10v_ts2,
-  "d10v",
-  "d10v:ts2",
-  4,   /* Section alignment power.  */
-  FALSE,
-  bfd_default_compatible,
-  bfd_default_scan,
-  & d10v_ts3_info,
-};
+  N (bfd_mach_d10v_ts2, "d10v:ts2", false, & d10v_ts3_info);

 
 const bfd_arch_info_type bfd_d10v_arch =
 
 const bfd_arch_info_type bfd_d10v_arch =

-{
-  16,  /* 16 bits in a word.  */
-  16,  /* 16 bits in an address.  */
-  8,   /* 8 bits in a byte.  */
-  bfd_arch_d10v,
-  bfd_mach_d10v,
-  "d10v",
-  "d10v",
-  4,   /* Section alignment power.  */
-  TRUE,
-  bfd_default_compatible,
-  bfd_default_scan,
-  & d10v_ts2_info,
-};
+  N (bfd_mach_d10v, "d10v", true, & d10v_ts2_info);