Index: armelf_nbsd.sh
===================================================================
RCS file: /cvsroot/src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh,v
retrieving revision 1.8
diff -p -u -u -r1.8 armelf_nbsd.sh
--- armelf_nbsd.sh	11 Oct 2016 02:49:38 -0000	1.8
+++ armelf_nbsd.sh	11 Oct 2016 04:25:54 -0000
@@ -9,11 +9,9 @@ unset STACK_ADDR
 unset EMBEDDED
 
 case "$target" in
-  aarch64*-*-netbsd* | arm*-*-netbsdelf*-*eabi*)
-    case "$EMULATION_NAME" in
-    *32*)
-      LIB_PATH='=/usr/lib/oabi'
-      ;;
-    esac
+  arm*-*-netbsdelf*)
+    ;;
+  aarch64*-*-netbsd* | arm*-*-netbsdelf*)
+    LIB_PATH='=/usr/lib/oabi'
     ;;
 esac
Index: armelf_nbsd_eabi.sh
===================================================================
RCS file: /cvsroot/src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh,v
retrieving revision 1.8
diff -p -u -u -r1.8 armelf_nbsd_eabi.sh
--- armelf_nbsd_eabi.sh	11 Oct 2016 02:49:38 -0000	1.8
+++ armelf_nbsd_eabi.sh	11 Oct 2016 04:25:54 -0000
@@ -8,17 +8,9 @@ OTHER_READONLY_SECTIONS="
   ${RELOCATING+ PROVIDE_HIDDEN (__exidx_end = .); }"
 
 case "$target" in
-  arm*-*-netbsdelf*-*eabihf*)
-    LIB_PATH='=/usr/lib/eabi'
-    ;;
   arm*-*-netbsdelf*-*eabi*)
-    LIB_PATH='=/usr/lib'
     ;;
   aarch64*-*-netbsd* | arm*-*-netbsdelf*)
-    case "$EMULATION_NAME" in
-    *32*)
-      LIB_PATH='=/usr/lib/eabi'
-      ;;
-    esac
+    LIB_PATH='=/usr/lib/eabi'
     ;;
 esac
Index: armelf_nbsd_eabihf.sh
===================================================================
RCS file: /cvsroot/src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh,v
retrieving revision 1.5
diff -p -u -u -r1.5 armelf_nbsd_eabihf.sh
--- armelf_nbsd_eabihf.sh	11 Oct 2016 02:49:38 -0000	1.5
+++ armelf_nbsd_eabihf.sh	11 Oct 2016 04:25:54 -0000
@@ -9,13 +9,8 @@ OTHER_READONLY_SECTIONS="
 
 case "$target" in
   arm*-*-netbsdelf*-*eabihf*)
-    LIB_PATH='=/usr/lib'
     ;;
   aarch64*-*-netbsd* | arm*-*-netbsdelf*)
-    case "$EMULATION_NAME" in
-    *32*)
-      LIB_PATH='=/usr/lib/eabihf'
-      ;;
-    esac
+    LIB_PATH='=/usr/lib/eabihf'
     ;;
 esac