1 files changed, 8 insertions, 13 deletions
diff --git a/bfd/cpu-m32r.c b/bfd/cpu-m32r.c
index 7022c29..d7e7a78 100644
--- a/bfd/cpu-m32r.c
+++ b/bfd/cpu-m32r.c
@@ -21,18 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-const bfd_arch_info_type bfd_m32r_arch =
+#define N(number, print, default, next)  \
+{  32, 32, 8, bfd_arch_m32r, number, "m32r", print, 4, default, bfd_default_compatible, bfd_default_scan, next }
+
+static const bfd_arch_info_type arch_info_struct[2] = 
 {
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_m32r,
-    0,
-    "d10v",
-    "d10v",
-    4, /* section alignment power */
-    true, /* the default */
-    bfd_default_compatible,
-    bfd_default_scan,
-    0
+  N( bfd_mach_m32rx, "m32rx", false, NULL ),
 };
+
+const bfd_arch_info_type bfd_m32r_arch =
+  N( bfd_mach_m32r, "m32r", true, & arch_info_struct[0] );