bfd/mcore: drop BFD_RELOC_MCORE_{PCREL_32,RVA}

They're unused. Really there was a bogus use in the assembler: If the
type isn't used anywhere else, the case label was stale (in one of two
ways; assume it was missed during some earlier conversion, with the
alternative being that it should be dropped altogether).

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index bcec515e8be74598271a0f1e8940ef727ebfccd1..d2b5af5e15c1d635273e4b5d92e3b927ebac66ae 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5119,9 +5119,7 @@ enum bfd_reloc_code_real
   BFD_RELOC_MCORE_PCREL_IMM8BY4,
   BFD_RELOC_MCORE_PCREL_IMM11BY2,
   BFD_RELOC_MCORE_PCREL_IMM4BY2,
-  BFD_RELOC_MCORE_PCREL_32,
   BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2,
-  BFD_RELOC_MCORE_RVA,
 
   /* Toshiba Media Processor Relocations.  */
   BFD_RELOC_MEP_8,

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 74c0fe026f03a079514737e5f62fa29430f70f68..d66df5286f970bdde67bca853a98d836ef20d504 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2253,9 +2253,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MCORE_PCREL_IMM8BY4",
   "BFD_RELOC_MCORE_PCREL_IMM11BY2",
   "BFD_RELOC_MCORE_PCREL_IMM4BY2",
-  "BFD_RELOC_MCORE_PCREL_32",
   "BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2",
-  "BFD_RELOC_MCORE_RVA",
   "BFD_RELOC_MEP_8",
   "BFD_RELOC_MEP_16",
   "BFD_RELOC_MEP_32",

diff --git a/bfd/reloc.c b/bfd/reloc.c
index 98343696a3348a58804e96f4e1ced8fc9c151b0c..60b165f49ce751a840d6771ff88d548f236466cc 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -4423,12 +4423,8 @@ ENUMX
   BFD_RELOC_MCORE_PCREL_IMM11BY2
 ENUMX
   BFD_RELOC_MCORE_PCREL_IMM4BY2
-ENUMX
-  BFD_RELOC_MCORE_PCREL_32
 ENUMX
   BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2
-ENUMX
-  BFD_RELOC_MCORE_RVA
 ENUMDOC
   Motorola Mcore relocations.
 

diff --git a/gas/config/tc-mcore.c b/gas/config/tc-mcore.c
index efd66ee10480ee10bd0a0cf775c39d12d4658ec2..a0c3e4c5a1c37cb431c965e59dac978f4c3a6d70 100644 (file)
--- a/gas/config/tc-mcore.c
+++ b/gas/config/tc-mcore.c
@@ -2015,7 +2015,7 @@ md_apply_fix (fixS *   fixP,
        fixP->fx_done = 0;
       break;
 
-    case BFD_RELOC_MCORE_PCREL_32:
+    case BFD_RELOC_32_PCREL:
     case BFD_RELOC_VTABLE_INHERIT:
     case BFD_RELOC_VTABLE_ENTRY:
       fixP->fx_done = 0;