[src/trunk]: src/external/gpl3/binutils/dist Revert all riscv-related local p...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b2bb450df293
branches:  trunk
changeset: 448810:b2bb450df293
user:      maya <maya%NetBSD.org@localhost>
date:      Sat Feb 09 19:40:32 2019 +0000

description:
Revert all riscv-related local patches.

As for the libbfd.h change: the definitions seem to mostly exist, but we
had duplicated them.

Fixes riscv64 binutils build.

diffstat:

 external/gpl3/binutils/dist/bfd/elfnn-riscv.c        |   7 +--
 external/gpl3/binutils/dist/bfd/libbfd.h             |  35 --------------------
 external/gpl3/binutils/dist/bfd/targets.c            |   1 -
 external/gpl3/binutils/dist/ld/emultempl/riscvelf.em |  11 ------
 external/gpl3/binutils/dist/opcodes/riscv-dis.c      |   1 -
 5 files changed, 2 insertions(+), 53 deletions(-)

diffs (115 lines):

diff -r 18e32a9768d8 -r b2bb450df293 external/gpl3/binutils/dist/bfd/elfnn-riscv.c
--- a/external/gpl3/binutils/dist/bfd/elfnn-riscv.c     Sat Feb 09 16:00:41 2019 +0000
+++ b/external/gpl3/binutils/dist/bfd/elfnn-riscv.c     Sat Feb 09 19:40:32 2019 +0000
@@ -24,12 +24,10 @@
 
 #include "sysdep.h"
 #include "bfd.h"
-#include "libiberty.h"
 #include "libbfd.h"
-#include "bfd_stdint.h"
+#include "bfdlink.h"
+#include "genlink.h"
 #include "elf-bfd.h"
-#include "bfdlink.h"
-#include "objalloc.h"
 #include "elfxx-riscv.h"
 #include "elf/riscv.h"
 #include "opcode/riscv.h"
@@ -351,7 +349,6 @@
   if (!_bfd_elf_create_dynamic_sections (dynobj, info))
     return FALSE;
 
-  htab->sdynbss = bfd_get_linker_section (dynobj, ".dynbss");
   if (!bfd_link_pic (info))
     {
       htab->sdyntdata =
diff -r 18e32a9768d8 -r b2bb450df293 external/gpl3/binutils/dist/bfd/libbfd.h
--- a/external/gpl3/binutils/dist/bfd/libbfd.h  Sat Feb 09 16:00:41 2019 +0000
+++ b/external/gpl3/binutils/dist/bfd/libbfd.h  Sat Feb 09 19:40:32 2019 +0000
@@ -2663,41 +2663,6 @@
   "BFD_RELOC_OR1K_TLS_TPOFF",
   "BFD_RELOC_OR1K_TLS_DTPOFF",
   "BFD_RELOC_OR1K_TLS_DTPMOD",
-  "BFD_RELOC_RISCV_ADD32",
-  "BFD_RELOC_RISCV_ADD64",
-  "BFD_RELOC_RISCV_SUB32",
-  "BFD_RELOC_RISCV_SUB64",
-  "BFD_RELOC_RISCV_HI20",
-  "BFD_RELOC_RISCV_LO12_I",
-  "BFD_RELOC_RISCV_LO12_S",
-  "BFD_RELOC_RISCV_PCREL_LO12_I",
-  "BFD_RELOC_RISCV_PCREL_LO12_S",
-  "BFD_RELOC_RISCV_CALL",
-  "BFD_RELOC_RISCV_CALL_PLT",
-  "BFD_RELOC_RISCV_PCREL_HI20",
-  "BFD_RELOC_RISCV_JMP",
-  "BFD_RELOC_RISCV_GOT_HI20",
-  "BFD_RELOC_RISCV_GOT_LO12",
-  "BFD_RELOC_RISCV_TLS_DTPMOD32",
-  "BFD_RELOC_RISCV_TLS_DTPREL32",
-  "BFD_RELOC_RISCV_TLS_DTPMOD64",
-  "BFD_RELOC_RISCV_TLS_DTPREL64",
-  "BFD_RELOC_RISCV_TLS_TPREL32",
-  "BFD_RELOC_RISCV_TLS_TPREL64",
-  "BFD_RELOC_RISCV_TPREL_HI20",
-  "BFD_RELOC_RISCV_TPREL_ADD",
-  "BFD_RELOC_RISCV_TPREL_LO12_S",
-  "BFD_RELOC_RISCV_TPREL_LO12_I",
-  "BFD_RELOC_RISCV_TLS_IE_HI20",
-  "BFD_RELOC_RISCV_TLS_IE_LO12",
-  "BFD_RELOC_RISCV_TLS_IE_ADD",
-  "BFD_RELOC_RISCV_TLS_IE_LO12_S",
-  "BFD_RELOC_RISCV_TLS_IE_LO12_I",
-  "BFD_RELOC_RISCV_TLS_GOT_HI20",
-  "BFD_RELOC_RISCV_TLS_GOT_LO12",
-  "BFD_RELOC_RISCV_TLS_GD_HI20",
-  "BFD_RELOC_RISCV_TLS_GD_LO12",
-  "BFD_RELOC_RISCV_TLS_PCREL_LO12",
   "BFD_RELOC_H8_DIR16A8",
   "BFD_RELOC_H8_DIR16R8",
   "BFD_RELOC_H8_DIR24A8",
diff -r 18e32a9768d8 -r b2bb450df293 external/gpl3/binutils/dist/bfd/targets.c
--- a/external/gpl3/binutils/dist/bfd/targets.c Sat Feb 09 16:00:41 2019 +0000
+++ b/external/gpl3/binutils/dist/bfd/targets.c Sat Feb 09 19:40:32 2019 +0000
@@ -1168,7 +1168,6 @@
        &rl78_elf32_vec,
 
 #ifdef BFD64
-        &riscv_elf64_vec,
        &rs6000_xcoff64_vec,
        &rs6000_xcoff64_aix_vec,
 #endif
diff -r 18e32a9768d8 -r b2bb450df293 external/gpl3/binutils/dist/ld/emultempl/riscvelf.em
--- a/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em      Sat Feb 09 16:00:41 2019 +0000
+++ b/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em      Sat Feb 09 19:40:32 2019 +0000
@@ -20,18 +20,7 @@
 
 fragment <<EOF
 
-#include "sysdep.h"
-#include "bfd.h"
-#include "bfdlink.h"
-#include "getopt.h"
-
-#include "ld.h"
 #include "ldmain.h"
-#include "ldmisc.h"
-#include "ldexp.h"
-#include "ldlang.h"
-#include "ldfile.h"
-#include "ldemul.h"
 #include "ldctor.h"
 #include "elf/riscv.h"
 #include "elfxx-riscv.h"
diff -r 18e32a9768d8 -r b2bb450df293 external/gpl3/binutils/dist/opcodes/riscv-dis.c
--- a/external/gpl3/binutils/dist/opcodes/riscv-dis.c   Sat Feb 09 16:00:41 2019 +0000
+++ b/external/gpl3/binutils/dist/opcodes/riscv-dis.c   Sat Feb 09 19:40:32 2019 +0000
@@ -29,7 +29,6 @@
 #include "elf/riscv.h"
 
 #include <stdint.h>
-
 #include <ctype.h>
 
 struct riscv_private_data