Module Name: src
Committed By: christos
Date: Sat Jan 30 01:17:05 UTC 2016
Modified Files:
src/external/gpl3/binutils/dist/ld/emulparams: elf32lriscv-defs.sh
elf32lriscv.sh elf64lriscv.sh
src/external/gpl3/binutils/dist/ld/emultempl: riscvelf.em
Log Message:
more riscv fixes
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv-defs.sh \
src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh \
src/external/gpl3/binutils/dist/ld/emulparams/elf64lriscv.sh
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em
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/ld/emulparams/elf32lriscv-defs.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv-defs.sh:1.2 src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv-defs.sh:1.3
--- src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv-defs.sh:1.2 Fri Mar 27 02:34:31 2015
+++ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv-defs.sh Fri Jan 29 20:17:05 2016
@@ -7,12 +7,6 @@ NO_REL_RELOCS=yes
TEMPLATE_NAME=elf32
EXTRA_EM_FILE=riscvelf
-case "$EMULATION_NAME" in
-elf32*) ELFSIZE=32; LIBPATH_SUFFIX=32 ;;
-elf64*) ELFSIZE=64; LIBPATH_SUFFIX= ;;
-*) echo $0: unhandled emulation $EMULATION_NAME >&2; exit 1 ;;
-esac
-
if test `echo "$host" | sed -e s/64//` = `echo "$target" | sed -e s/64//`; then
case " $EMULATION_LIBPATH " in
*" ${EMULATION_NAME} "*)
Index: src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh:1.2 src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh:1.3
--- src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh:1.2 Fri Mar 27 02:34:31 2015
+++ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh Fri Jan 29 20:17:05 2016
@@ -1,2 +1,3 @@
+ELFSIZE=32
. ${srcdir}/emulparams/elf32lriscv-defs.sh
OUTPUT_FORMAT="elf32-littleriscv"
Index: src/external/gpl3/binutils/dist/ld/emulparams/elf64lriscv.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf64lriscv.sh:1.2 src/external/gpl3/binutils/dist/ld/emulparams/elf64lriscv.sh:1.3
--- src/external/gpl3/binutils/dist/ld/emulparams/elf64lriscv.sh:1.2 Fri Mar 27 02:34:31 2015
+++ src/external/gpl3/binutils/dist/ld/emulparams/elf64lriscv.sh Fri Jan 29 20:17:05 2016
@@ -1,2 +1,3 @@
+ELFSIZE=64
. ${srcdir}/emulparams/elf64lriscv-defs.sh
OUTPUT_FORMAT="elf64-littleriscv"
Index: src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em
diff -u src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em:1.2 src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em:1.3
--- src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em:1.2 Fri Mar 27 02:34:31 2015
+++ src/external/gpl3/binutils/dist/ld/emultempl/riscvelf.em Fri Jan 29 20:17:05 2016
@@ -20,7 +20,18 @@
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"
@@ -51,7 +62,7 @@ gld${EMULATION_NAME}_after_allocation (v
/* Don't attempt to discard unused .eh_frame sections until the final link,
as we can't reliably tell if they're used until after relaxation. */
- if (!link_info.relocatable)
+ if (!bfd_link_relocatable (&link_info))
{
need_layout = bfd_elf_discard_info (link_info.output_bfd, &link_info);
if (need_layout < 0)
