Don't expose R_RISCV_DELETE to the ELF ABI

riscvarchive · May 19, 2017 · 70723ec · 70723ec
1 parent af7bc71
commit 70723ec
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
@@ -4749,7 +4749,6 @@ number for the SBIC, SBIS, SBI and CBI instructions  */
   BFD_RELOC_RISCV_SET8,
   BFD_RELOC_RISCV_SET16,
   BFD_RELOC_RISCV_SET32,
-  BFD_RELOC_RISCV_DELETE,
 
 /* Renesas RL78 Relocations.  */
   BFD_RELOC_RL78_NEG8,

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
@@ -910,7 +910,6 @@ static const struct elf_reloc_map riscv_reloc_map[] =
   { BFD_RELOC_RISCV_SET8, R_RISCV_SET8 },
   { BFD_RELOC_RISCV_SET16, R_RISCV_SET16 },
   { BFD_RELOC_RISCV_SET32, R_RISCV_SET32 },
-  { BFD_RELOC_RISCV_DELETE, R_RISCV_DELETE },
 };
 
 /* Given a BFD reloc type, return a howto structure.  */

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
@@ -2210,7 +2210,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_RISCV_SET8",
   "BFD_RELOC_RISCV_SET16",
   "BFD_RELOC_RISCV_SET32",
-  "BFD_RELOC_RISCV_DELETE",
   "BFD_RELOC_RL78_NEG8",
   "BFD_RELOC_RL78_NEG16",
   "BFD_RELOC_RL78_NEG24",

diff --git a/bfd/reloc.c b/bfd/reloc.c
@@ -5144,8 +5144,6 @@ ENUMX
   BFD_RELOC_RISCV_SET16
 ENUMX
   BFD_RELOC_RISCV_SET32
-ENUMX
-  BFD_RELOC_RISCV_DELETE
 ENUMDOC
   RISC-V relocations.
 

diff --git a/include/elf/riscv.h b/include/elf/riscv.h
@@ -87,9 +87,11 @@ START_RELOC_NUMBERS (elf_riscv_reloc_type)
   RELOC_NUMBER (R_RISCV_SET8, 54)
   RELOC_NUMBER (R_RISCV_SET16, 55)
   RELOC_NUMBER (R_RISCV_SET32, 56)
-  RELOC_NUMBER (R_RISCV_DELETE, 57)
 END_RELOC_NUMBERS (R_RISCV_max)
 
+/* Relocation types not emitted to binaries. */
+#define R_RISCV_DELETE 127
+
 /* Processor specific flags for the ELF header e_flags field.  */
 
 /* File may contain compressed instructions.  */