Module Name: src
Committed By: maya
Date: Sat Feb 9 19:40:32 UTC 2019
Modified Files:
src/external/gpl3/binutils/dist/bfd: elfnn-riscv.c libbfd.h targets.c
src/external/gpl3/binutils/dist/ld/emultempl: riscvelf.em
src/external/gpl3/binutils/dist/opcodes: riscv-dis.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/bfd/elfnn-riscv.c
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/bfd/libbfd.h
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/bfd/targets.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/opcodes/riscv-dis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/elfnn-riscv.c
diff -u src/external/gpl3/binutils/dist/bfd/elfnn-riscv.c:1.5 src/external/gpl3/binutils/dist/bfd/elfnn-riscv.c:1.6
--- src/external/gpl3/binutils/dist/bfd/elfnn-riscv.c:1.5 Wed Nov 7 01:13:52 2018
+++ src/external/gpl3/binutils/dist/bfd/elfnn-riscv.c Sat Feb 9 19:40:32 2019
@@ -24,12 +24,10 @@
#include "sysdep.h"
#include "bfd.h"
-#include "libiberty.h"
#include "libbfd.h"
-#include "bfd_stdint.h"
-#include "elf-bfd.h"
#include "bfdlink.h"
-#include "objalloc.h"
+#include "genlink.h"
+#include "elf-bfd.h"
#include "elfxx-riscv.h"
#include "elf/riscv.h"
#include "opcode/riscv.h"
@@ -351,7 +349,6 @@ riscv_elf_create_dynamic_sections (bfd *
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 =
Index: src/external/gpl3/binutils/dist/bfd/libbfd.h
diff -u src/external/gpl3/binutils/dist/bfd/libbfd.h:1.10 src/external/gpl3/binutils/dist/bfd/libbfd.h:1.11
--- src/external/gpl3/binutils/dist/bfd/libbfd.h:1.10 Wed Nov 7 01:13:52 2018
+++ src/external/gpl3/binutils/dist/bfd/libbfd.h Sat Feb 9 19:40:32 2019
@@ -2663,41 +2663,6 @@ static const char *const bfd_reloc_code_
"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",
Index: src/external/gpl3/binutils/dist/bfd/targets.c
diff -u src/external/gpl3/binutils/dist/bfd/targets.c:1.9 src/external/gpl3/binutils/dist/bfd/targets.c:1.10
--- src/external/gpl3/binutils/dist/bfd/targets.c:1.9 Wed Nov 7 01:13:52 2018
+++ src/external/gpl3/binutils/dist/bfd/targets.c Sat Feb 9 19:40:32 2019
@@ -1168,7 +1168,6 @@ static const bfd_target * const _bfd_tar
&rl78_elf32_vec,
#ifdef BFD64
- &riscv_elf64_vec,
&rs6000_xcoff64_vec,
&rs6000_xcoff64_aix_vec,
#endif
Index: src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em
diff -u src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em:1.5 src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em:1.6
--- src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em:1.5 Wed Nov 7 01:13:55 2018
+++ src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em Sat Feb 9 19:40:32 2019
@@ -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"
Index: src/external/gpl3/binutils/dist/opcodes/riscv-dis.c
diff -u src/external/gpl3/binutils/dist/opcodes/riscv-dis.c:1.5 src/external/gpl3/binutils/dist/opcodes/riscv-dis.c:1.6
--- src/external/gpl3/binutils/dist/opcodes/riscv-dis.c:1.5 Wed Nov 7 01:13:56 2018
+++ src/external/gpl3/binutils/dist/opcodes/riscv-dis.c Sat Feb 9 19:40:32 2019
@@ -29,7 +29,6 @@
#include "elf/riscv.h"
#include <stdint.h>
-
#include <ctype.h>
struct riscv_private_data
