Module Name: src
Committed By: matt
Date: Fri Jan 31 07:32:54 UTC 2014
Modified Files:
src/external/gpl3/binutils/dist/ld: Makefile.am Makefile.in
configure.tgt
src/external/gpl3/binutils/dist/ld/emulparams: armelf_nbsd_eabi.sh
Log Message:
Use separate emulations for EABI hardfloat / softfloat.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/ld/Makefile.am \
src/external/gpl3/binutils/dist/ld/Makefile.in
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/binutils/dist/ld/configure.tgt
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
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/Makefile.am
diff -u src/external/gpl3/binutils/dist/ld/Makefile.am:1.6 src/external/gpl3/binutils/dist/ld/Makefile.am:1.7
--- src/external/gpl3/binutils/dist/ld/Makefile.am:1.6 Wed Jan 29 05:27:35 2014
+++ src/external/gpl3/binutils/dist/ld/Makefile.am Fri Jan 31 07:32:53 2014
@@ -146,6 +146,7 @@ ALL_EMULATION_SOURCES = \
earmelf_nacl.c \
earmelf_nbsd.c \
earmelf_nbsd_eabi.c \
+ earmelf_nbsd_eabihf.c \
earmelf_vxworks.c \
earmelfb.c \
earmelfb_linux.c \
@@ -153,6 +154,7 @@ ALL_EMULATION_SOURCES = \
earmelfb_nacl.c \
earmelfb_nbsd.c \
earmelfb_nbsd_eabi.c \
+ earmelfb_nbsd_eabihf.c \
earmnbsd.c \
earmnto.c \
earmpe.c \
@@ -734,10 +736,17 @@ earmelf_nbsd.c: $(srcdir)/emulparams/arm
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} armelf_nbsd "$(tdir_armelf_nbsd)"
earmelf_nbsd_eabi.c: $(srcdir)/emulparams/armelf_nbsd_eabi.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
+ $(srcdir)/emulparams/armelf.sh \
+ $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} armelf_nbsd_eabi "$(tdir_armelf_nbsd_eabi)"
+earmelf_nbsd_eabihf.c: $(srcdir)/emulparams/armelf_nbsd_eabihf.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
$(srcdir)/emulparams/armelf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- ${GENSCRIPTS} armelf_nbsd_abi "$(tdir_armelf_nbsd_eabi)"
+ ${GENSCRIPTS} armelf_nbsd_eabihf "$(tdir_armelf_nbsd_eabihf)"
earmelf_vxworks.c: $(srcdir)/emulparams/armelf_vxworks.sh \
$(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/armelf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/vxworks.em \
@@ -773,12 +782,19 @@ earmelfb_nbsd.c: $(srcdir)/emulparams/ar
$(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} armelfb_nbsd "$(tdir_armelfb_nbsd)"
-earmelfb_nbsd_abi.c: $(srcdir)/emulparams/armelfb_nbsd_abi.sh \
- $(srcdir)/emulparams/armelf_nbsd_abi.sh \
+earmelfb_nbsd_eabi.c: $(srcdir)/emulparams/armelfb_nbsd_eabi.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
+ $(srcdir)/emulparams/armelf.sh \
+ $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} armelfb_nbsd_eabi "$(tdir_armelfb_nbsd_eabi)"
+earmelfb_nbsd_eabihf.c: $(srcdir)/emulparams/armelfb_nbsd_eabihf.sh \
+ $(srcdir)/emulparams/armelf_nbsd_eabi.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
$(srcdir)/emulparams/armelf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- ${GENSCRIPTS} armelfb_nbsd_abi "$(tdir_armelfb_nbsd_abi)"
+ ${GENSCRIPTS} armelfb_nbsd_eabihf "$(tdir_armelfb_nbsd_eabihf)"
earmnbsd.c: $(srcdir)/emulparams/armnbsd.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
${GENSCRIPTS} armnbsd "$(tdir_armnbsd)"
Index: src/external/gpl3/binutils/dist/ld/Makefile.in
diff -u src/external/gpl3/binutils/dist/ld/Makefile.in:1.6 src/external/gpl3/binutils/dist/ld/Makefile.in:1.7
--- src/external/gpl3/binutils/dist/ld/Makefile.in:1.6 Sun Sep 29 14:03:31 2013
+++ src/external/gpl3/binutils/dist/ld/Makefile.in Fri Jan 31 07:32:53 2014
@@ -453,6 +453,7 @@ ALL_EMULATION_SOURCES = \
earmelf_nacl.c \
earmelf_nbsd.c \
earmelf_nbsd_eabi.c \
+ earmelf_nbsd_eabihf.c \
earmelf_vxworks.c \
earmelfb.c \
earmelfb_linux.c \
@@ -460,6 +461,7 @@ ALL_EMULATION_SOURCES = \
earmelfb_nacl.c \
earmelfb_nbsd.c \
earmelfb_nbsd_eabi.c \
+ earmelfb_nbsd_eabihf.c \
earmnbsd.c \
earmnto.c \
earmpe.c \
@@ -1080,7 +1082,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux_eabi.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nacl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd_abi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd_eabi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd_eabihf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_vxworks.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux.Po@am__quote@
@@ -1088,6 +1091,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nacl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nbsd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nbsd_eabi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nbsd_eabihf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmnbsd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmnto.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmpe.Po@am__quote@
@@ -2208,10 +2212,17 @@ earmelf_nbsd.c: $(srcdir)/emulparams/arm
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} armelf_nbsd "$(tdir_armelf_nbsd)"
earmelf_nbsd_eabi.c: $(srcdir)/emulparams/armelf_nbsd_eabi.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
$(srcdir)/emulparams/armelf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} armelf_nbsd_eabi "$(tdir_armelf_nbsd_eabi)"
+earmelf_nbsd_eabihf.c: $(srcdir)/emulparams/armelf_nbsd_eabihf.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
+ $(srcdir)/emulparams/armelf.sh \
+ $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} armelf_nbsd_eabihf "$(tdir_armelf_nbsd_eabihf)"
earmelf_vxworks.c: $(srcdir)/emulparams/armelf_vxworks.sh \
$(srcdir)/emulparams/vxworks.sh $(srcdir)/emulparams/armelf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/vxworks.em \
@@ -2249,10 +2260,18 @@ earmelfb_nbsd.c: $(srcdir)/emulparams/ar
${GENSCRIPTS} armelfb_nbsd "$(tdir_armelfb_nbsd)"
earmelfb_nbsd_eabi.c: $(srcdir)/emulparams/armelfb_nbsd_eabi.sh \
$(srcdir)/emulparams/armelf_nbsd_eabi.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
$(srcdir)/emulparams/armelf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} armelfb_nbsd_eabi "$(tdir_armelfb_nbsd_eabi)"
+earmelfb_nbsd_eabihf.c: $(srcdir)/emulparams/armelfb_nbsd_eabihf.sh \
+ $(srcdir)/emulparams/armelf_nbsd_eabihf.sh \
+ $(srcdir)/emulparams/armelf_nbsd.sh \
+ $(srcdir)/emulparams/armelf.sh \
+ $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} armelfb_nbsd_eabihf "$(tdir_armelfb_nbsd_eabihf)"
earmnbsd.c: $(srcdir)/emulparams/armnbsd.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
${GENSCRIPTS} armnbsd "$(tdir_armnbsd)"
Index: src/external/gpl3/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.14 src/external/gpl3/binutils/dist/ld/configure.tgt:1.15
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.14 Wed Jan 29 23:16:14 2014
+++ src/external/gpl3/binutils/dist/ld/configure.tgt Fri Jan 31 07:32:53 2014
@@ -64,12 +64,18 @@ arm-*-coff) targ_emul=armcoff ;;
arm-*-freebsd* | arm-*-kfreebsd*-gnu)
targ_emul=armelf_fbsd
targ_extra_emuls="armelf" ;;
+arm*eb-*-netbsdelf*-*eabihf*)
+ targ_emul=armelfb_nbsd_eabihf;
+ targ_extra_emuls="armelf_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
arm*eb-*-netbsdelf*-*eabi*)
targ_emul=armelfb_nbsd_eabi;
- targ_extra_emuls="armelf_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
+ targ_extra_emuls="armelf_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
+arm*-*-netbsdelf*-*eabihf*)
+ targ_emul=armelf_nbsd_eabihf;
+ targ_extra_emuls="armelfb_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
arm*-*-netbsdelf*-*eabi*)
targ_emul=armelf_nbsd_eabi;
- targ_extra_emuls="armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
+ targ_extra_emuls="armelfb_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf armnbsd" ;;
arm*eb-*-netbsdelf*) targ_emul=armelfb_nbsd;
targ_extra_emuls="armelf_nbsd armelf armnbsd" ;;
arm-*-netbsdelf*) targ_emul=armelf_nbsd;
Index: src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.3 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.4
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.3 Fri Nov 29 23:01:54 2013
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh Fri Jan 31 07:32:54 2014
@@ -10,6 +10,9 @@ OTHER_READONLY_SECTIONS="
unset LIB_PATH
case "$target" in
+ arm*-*-netbsdelf*-*eabihf*)
+ LIB_PATH='=/usr/lib/eabi'
+ ;;
arm*-*-netbsdelf*-*eabi*)
;;
arm*-*-netbsdelf*)
