X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-tic4x.c;h=cf87bfedf5bf7d5bc955b8a20949c66f64886804;hb=a13ba30840ba7a8450dcb4edd356de61fcb89130;hp=9c47be0e7436afd1c225037430f3dc9936768410;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-tic4x.c b/bfd/cpu-tic4x.c
index 9c47be0e74..cf87bfedf5 100644
--- a/bfd/cpu-tic4x.c
+++ b/bfd/cpu-tic4x.c
@@ -1,5 +1,5 @@
 /* bfd back-end for TMS320C[34]x support
-   Copyright (C) 1996-2016 Free Software Foundation, Inc.
+   Copyright (C) 1996-2019 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
 
@@ -45,39 +45,26 @@ tic4x_scan (const struct bfd_arch_info *info,
   return FALSE;
 }
 
+#define N(NUMBER, NAME, PRINT, DEFAULT, NEXT)		\
+  {							\
+    32,        /* Bits in a word.  */			\
+    32,        /* Bits in an address.  */		\
+    32,	       /* Bits in a byte.  */			\
+    bfd_arch_tic4x,					\
+    NUMBER,						\
+    NAME,						\
+    PRINT,						\
+    0,		/* Section alignment power.  */		\
+    DEFAULT,						\
+    bfd_default_compatible,				\
+    tic4x_scan,						\
+    bfd_arch_default_fill,				\
+    NEXT,						\
+    0 /* Maximum offset of a reloc from the start of an insn.  */ \
+  }
 
 const bfd_arch_info_type bfd_tic3x_arch =
-  {
-    32,				/* 32 bits in a word.  */
-    32,				/* 32 bits in an address.  */
-    32,				/* 32 bits in a byte.  */
-    bfd_arch_tic4x,
-    bfd_mach_tic3x,		/* Machine number.  */
-    "tic3x",			/* Architecture name.  */
-    "tms320c3x",		/* Printable name.  */
-    0,				/* Alignment power.  */
-    FALSE,			/* Not the default architecture.  */
-    bfd_default_compatible,
-    tic4x_scan,
-    bfd_arch_default_fill,
-    0
-  };
+  N (bfd_mach_tic3x, "tic3x", "tms320c3x", FALSE, NULL);
 
 const bfd_arch_info_type bfd_tic4x_arch =
-  {
-    32,				/* 32 bits in a word.  */
-    32,				/* 32 bits in an address.  */
-    32,				/* 32 bits in a byte.  */
-    bfd_arch_tic4x,
-    bfd_mach_tic4x,		/* Machine number.  */
-    "tic4x",			/* Architecture name.  */
-    "tms320c4x",		/* Printable name.  */
-    0,				/* Alignment power.  */
-    TRUE,			/* The default architecture.  */
-    bfd_default_compatible,
-    tic4x_scan,
-    bfd_arch_default_fill,
-    &bfd_tic3x_arch,
-  };
-
-
+  N (bfd_mach_tic4x, "tic4x", "tms320c4x", TRUE, &bfd_tic3x_arch);