RX: bfd - Add RXv3 support.

        * bfd/archures.c: Add bfd_mach_rx_v2 and bfd_mach_rx_v3.
        * bfd/bfd-in2.h: Regenerate.
        * bfd/cpu-rx.c (arch_info_struct): Add RXv2 and RXv3 entry.
        * bfd/elf32-rx.c (elf32_rx_machine): Add RXv2 and RXv3 support.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 880ee8e80e5d2e22f200bb6cbec52a221ae5bad4..3d619e46ed2f80d6bbea085afcfabdcaba1bc5fe 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-05  Yoshinori Sato <ysato@users.sourceforge.jp>
+
+       * bfd/archures.c: Add bfd_mach_rx_v2 and bfd_mach_rx_v3.
+       * bfd/bfd-in2.h: Regenerate.
+       * bfd/cpu-rx.c (arch_info_struct): Add RXv2 and RXv3 entry.
+       * bfd/elf32-rx.c (elf32_rx_machine): Add RXv2 and RXv3 support.
+
 2019-01-04  Lifang Xia  <lifang_xia@c-sky.com>
 
        * config.bfd (csky-*-elf* | csky-*-linux*): Modify the csky

diff --git a/bfd/archures.c b/bfd/archures.c
index ce97059cc72907a4dab4b97f79aa3f05fcea5a70..647cf0d8d4273651c211cb867bb7f1690e5c4937 100644 (file)
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -460,6 +460,8 @@ DESCRIPTION
 .#define bfd_mach_rl78         0x75
 .  bfd_arch_rx,               {* Renesas RX.  *}
 .#define bfd_mach_rx           0x75
+.#define bfd_mach_rx_v2                0x76
+.#define bfd_mach_rx_v3                0x77
 .  bfd_arch_s390,      {* IBM s390.  *}
 .#define bfd_mach_s390_31      31
 .#define bfd_mach_s390_64      64

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 59c48e754306c972ca865868984634351f585861..b78d212ec57de7d1aa8089eeb88bd835ce441f4e 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -2359,6 +2359,8 @@ enum bfd_architecture
 #define bfd_mach_rl78          0x75
   bfd_arch_rx,        /* Renesas RX.  */
 #define bfd_mach_rx            0x75
+#define bfd_mach_rx_v2         0x76
+#define bfd_mach_rx_v3         0x77
   bfd_arch_s390,      /* IBM s390.  */
 #define bfd_mach_s390_31       31
 #define bfd_mach_s390_64       64

diff --git a/bfd/cpu-rx.c b/bfd/cpu-rx.c
index 448f1e9b33c29bcae80ff976bef79b459424bab1..821edeb590b0f679db75a8578712f2a4dc1c66d6 100644 (file)
--- a/bfd/cpu-rx.c
+++ b/bfd/cpu-rx.c
@@ -37,6 +37,36 @@ static const bfd_arch_info_type arch_info_struct[] =
     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.  */
+    32,                                /* Bits per address.  */
+    8,                         /* Bits per byte.  */
+    bfd_arch_rx,               /* Architecture.  */
+    bfd_mach_rx_v2,            /* Machine.  */
+    "rx:v2",                   /* Architecture name.  */
+    "rx:v2",                   /* Printable name.  */
+    3,                         /* 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[2]       /* Next in list.  */
+  },
+  {
+    32,                                /* Bits per word.  */
+    32,                                /* Bits per address.  */
+    8,                         /* Bits per byte.  */
+    bfd_arch_rx,               /* Architecture.  */
+    bfd_mach_rx_v3,            /* Machine.  */
+    "rx:v3",                   /* Architecture name.  */
+    "rx:v3",                   /* Printable name.  */
+    3,                         /* 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.  */
   },
 };

diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index e28edb6f689b4ca818aff923d1dd3d2ea2d4a5bd..0b5f983a9a6785968475800db624fc81115b86ab 100644 (file)
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -3212,7 +3212,12 @@ elf32_rx_machine (bfd * abfd ATTRIBUTE_UNUSED)
         For now we assume that the flags are OK.  */
   if ((elf_elfheader (abfd)->e_flags & EF_RX_CPU_MASK) == EF_RX_CPU_RX)
 #endif
-    return bfd_mach_rx;
+    if ((elf_elfheader (abfd)->e_flags & E_FLAG_RX_V2))
+      return bfd_mach_rx_v2;
+    else if ((elf_elfheader (abfd)->e_flags & E_FLAG_RX_V3))
+      return bfd_mach_rx_v3;
+    else
+      return bfd_mach_rx;
 
   return 0;
 }