Module Name:    src
Committed By:   mrg
Date:           Tue Oct 11 07:05:29 UTC 2016

Modified Files:
        src/external/gpl3/binutils/dist/ld/emulparams: armelf_nbsd.sh
            armelf_nbsd_eabi.sh armelf_nbsd_eabihf.sh

Log Message:
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!


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh \
    src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh
cvs rdiff -u -r1.5 -r1.6 \
    src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.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/emulparams/armelf_nbsd.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh:1.8 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh:1.9
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh:1.8	Tue Oct 11 02:49:38 2016
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd.sh	Tue Oct 11 07:05:29 2016
@@ -11,7 +11,7 @@ unset EMBEDDED
 case "$target" in
   aarch64*-*-netbsd* | arm*-*-netbsdelf*-*eabi*)
     case "$EMULATION_NAME" in
-    *32*)
+    armelf*_nbsd)
       LIB_PATH='=/usr/lib/oabi'
       ;;
     esac
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.8 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.9
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh:1.8	Tue Oct 11 02:49:38 2016
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabi.sh	Tue Oct 11 07:05:29 2016
@@ -9,14 +9,17 @@ OTHER_READONLY_SECTIONS="
 
 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

Index: src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.5 src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.6
--- src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh:1.5	Tue Oct 11 02:49:38 2016
+++ src/external/gpl3/binutils/dist/ld/emulparams/armelf_nbsd_eabihf.sh	Tue Oct 11 07:05:29 2016
@@ -9,11 +9,10 @@ OTHER_READONLY_SECTIONS="
 
 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

Reply via email to