[PATCH v3] aarch64: Emit jump slot for conditional branch to undefined symbols

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

diff --git a/bfd/cpu-mt.c b/bfd/cpu-mt.c
index 42f157ddd5bcdd7938ceee1722cbaf785d1e1d42..11ce79c2729ae6579993a45528d9a9938daaef61 100644 (file)
--- a/bfd/cpu-mt.c
+++ b/bfd/cpu-mt.c
@@ -1,5 +1,5 @@
 /* BFD support for the Morpho Technologies MT processor.
 /* BFD support for the Morpho Technologies MT processor.

-   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+   Copyright (C) 2001-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.
 


@@ -15,61 +15,38 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"
 
 
 #include "sysdep.h"
 #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 =
 };
 
 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);
+