[src/trunk]: src/external/gpl3/binutils/dist/ld/emulparams fix the previous -...

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

details:   https://anonhg.NetBSD.org/src/rev/ef1234bf8e48
branches:  trunk
changeset: 348235:ef1234bf8e48
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Oct 11 07:05:29 2016 +0000

description:
fix the previous - the emul names don't tend to include "32".
tested on shark, though fixes to make compiling for oabi work
remain uncommited.

now an aarch64 build almost completes!

diffstat:

 external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh        |  2 +-
 external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh   |  9 ++++++---
 external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh |  3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 77cdb58861ef -r ef1234bf8e48 external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh
--- a/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh  Tue Oct 11 06:31:07 2016 +0000
+++ b/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh  Tue Oct 11 07:05:29 2016 +0000
@@ -11,7 +11,7 @@
 case "$target" in
   aarch64*-*-netbsd* | arm*-*-netbsdelf*-*eabi*)
     case "$EMULATION_NAME" in
-    *32*)
+    armelf*_nbsd)
       LIB_PATH='=/usr/lib/oabi'
       ;;
     esac
diff -r 77cdb58861ef -r ef1234bf8e48 external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
--- a/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh     Tue Oct 11 06:31:07 2016 +0000
+++ b/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh     Tue Oct 11 07:05:29 2016 +0000
@@ -9,14 +9,17 @@
 
 case "$target" in
   arm*-*-netbsdelf*-*eabihf*)
-    LIB_PATH='=/usr/lib/eabi'
+    case "$EMULATION_NAME" in
+    *armelf*eabi)
+      LIB_PATH='=/usr/lib/eabi'
+      ;;
+    esac
     ;;
   arm*-*-netbsdelf*-*eabi*)
-    LIB_PATH='=/usr/lib'
     ;;
   aarch64*-*-netbsd* | arm*-*-netbsdelf*)
     case "$EMULATION_NAME" in
-    *32*)
+    *armelf*eabi)
       LIB_PATH='=/usr/lib/eabi'
       ;;
     esac
diff -r 77cdb58861ef -r ef1234bf8e48 external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh
--- a/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh   Tue Oct 11 06:31:07 2016 +0000
+++ b/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh   Tue Oct 11 07:05:29 2016 +0000
@@ -9,11 +9,10 @@
 
 case "$target" in
   arm*-*-netbsdelf*-*eabihf*)
-    LIB_PATH='=/usr/lib'
     ;;
   aarch64*-*-netbsd* | arm*-*-netbsdelf*)
     case "$EMULATION_NAME" in
-    *32*)
+    *armelf*eabihf)
       LIB_PATH='=/usr/lib/eabihf'
       ;;
     esac