[src/trunk]: src/external/gpl3/binutils/dist/ld Add support for setting LIB_P...

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

details:   https://anonhg.NetBSD.org/src/rev/3c78ae7e90e7
branches:  trunk
changeset: 327417:3c78ae7e90e7
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Mar 07 04:13:46 2014 +0000

description:
Add support for setting LIB_PATH for powerpc*-netbsd* on powerpc64*-netbsd*

diffstat:

 external/gpl3/binutils/dist/ld/Makefile.am                 |   7 +++++++
 external/gpl3/binutils/dist/ld/Makefile.in                 |   8 ++++++++
 external/gpl3/binutils/dist/ld/configure.tgt               |  12 +++++++++++-
 external/gpl3/binutils/dist/ld/emulparams/elf32ppc_nbsd.sh |   7 +++++++
 4 files changed, 33 insertions(+), 1 deletions(-)

diffs (90 lines):

diff -r dffefc7c9e26 -r 3c78ae7e90e7 external/gpl3/binutils/dist/ld/Makefile.am
--- a/external/gpl3/binutils/dist/ld/Makefile.am        Fri Mar 07 04:11:07 2014 +0000
+++ b/external/gpl3/binutils/dist/ld/Makefile.am        Fri Mar 07 04:13:46 2014 +0000
@@ -248,6 +248,7 @@
        eelf32openrisc.c \
        eelf32ppc.c \
        eelf32ppc_fbsd.c \
+       eelf32ppc_nbsd.c \
        eelf32ppclinux.c \
        eelf32ppcnto.c \
        eelf32ppcsim.c \
@@ -1173,6 +1174,12 @@
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf32ppc_fbsd "$(tdir_elf32ppc_fbsd)"
+eelf32ppc_nbsd.c: $(srcdir)/emulparams/elf32ppc_nbsd.sh \
+  $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
+  $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
+  ldemul-list.h \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+       ${GENSCRIPTS} elf32ppc_nbsd "$(tdir_elf32ppc_nbsd)"
 eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
diff -r dffefc7c9e26 -r 3c78ae7e90e7 external/gpl3/binutils/dist/ld/Makefile.in
--- a/external/gpl3/binutils/dist/ld/Makefile.in        Fri Mar 07 04:11:07 2014 +0000
+++ b/external/gpl3/binutils/dist/ld/Makefile.in        Fri Mar 07 04:13:46 2014 +0000
@@ -555,6 +555,7 @@
        eelf32openrisc.c \
        eelf32ppc.c \
        eelf32ppc_fbsd.c \
+       eelf32ppc_nbsd.c \
        eelf32ppclinux.c \
        eelf32ppcnto.c \
        eelf32ppcsim.c \
@@ -1180,6 +1181,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32openrisc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppc_fbsd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppc_nbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppclinux.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppcnto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32ppcsim.Po@am__quote@
@@ -2650,6 +2652,12 @@
   ldemul-list.h \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
        ${GENSCRIPTS} elf32ppc_fbsd "$(tdir_elf32ppc_fbsd)"
+eelf32ppc_nbsd.c: $(srcdir)/emulparams/elf32ppc_nbsd.sh \
+  $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
+  $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
+  ldemul-list.h \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+       ${GENSCRIPTS} elf32ppc_nbsd "$(tdir_elf32ppc_nbsd)"
 eelf32ppclinux.c: $(srcdir)/emulparams/elf32ppclinux.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
diff -r dffefc7c9e26 -r 3c78ae7e90e7 external/gpl3/binutils/dist/ld/configure.tgt
--- a/external/gpl3/binutils/dist/ld/configure.tgt      Fri Mar 07 04:11:07 2014 +0000
+++ b/external/gpl3/binutils/dist/ld/configure.tgt      Fri Mar 07 04:13:46 2014 +0000
@@ -548,8 +548,18 @@
                        *)      targ_emul=elf32lppc
                                targ_extra_emuls="elf32ppcsim" ;;
                        esac ;;
+powerpc64*-*-netbsd*)
+                       targ_emul=elf64ppc
+                       targ_extra_emuls="elf32ppc elf32ppc_nbsd elf32ppcsim"
+                       tdir_elf32ppc=`echo "${targ_alias}" | sed -e 's/64//'`
+                       tdir_elf32ppc_nbsd=$tdir_elf32ppc
+                       tdir_elf32ppcsim=$tdir_elf32ppc
+                       ;;
+powerpc*-*-netbsd*)
+                       targ_emul=elf32ppc_nbsd
+                       targ_extra_emuls="elf32ppc elf32ppcsim" ;;
 powerpc*-*-elf* | powerpc*-*-eabi* | powerpc*-*-sysv* \
-  | powerpc*-*-netbsd* | powerpc-*-openbsd* | powerpc*-*-kaos*)
+  | powerpc-*-openbsd* | powerpc*-*-kaos*)
                       case "${targ}" in
                       *64*)    targ_emul=elf64ppc
                                targ_extra_emuls="elf32ppc elf32ppclinux elf32ppcsim"
diff -r dffefc7c9e26 -r 3c78ae7e90e7 external/gpl3/binutils/dist/ld/emulparams/elf32ppc_nbsd.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/binutils/dist/ld/emulparams/elf32ppc_nbsd.sh        Fri Mar 07 04:13:46 2014 +0000
@@ -0,0 +1,7 @@
+. ${srcdir}/emulparams/elf32ppc.sh
+
+case "$target" in
+  powerpc64*-*-netbsd*)
+    LIB_PATH='=/usr/lib/powerpc'
+    ;;
+esac