[src/trunk]: src/external/gpl3/binutils/dist/gas Fix merge botch. arm eabi ta...

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

details:   https://anonhg.NetBSD.org/src/rev/dd8a44e9d06c
branches:  trunk
changeset: 820577:dd8a44e9d06c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Jan 11 14:13:05 2017 +0000

description:
Fix merge botch. arm eabi targets now match properly and we get the
right defaults.

diffstat:

 external/gpl3/binutils/dist/gas/configure.tgt |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 5d61382e66da -r dd8a44e9d06c external/gpl3/binutils/dist/gas/configure.tgt
--- a/external/gpl3/binutils/dist/gas/configure.tgt     Wed Jan 11 13:47:27 2017 +0000
+++ b/external/gpl3/binutils/dist/gas/configure.tgt     Wed Jan 11 14:13:05 2017 +0000
@@ -140,6 +140,8 @@
   arm-*-phoenix*)                      fmt=elf ;;
   arm-*-rtems*)                                fmt=elf ;;
   arm-*-elf)                           fmt=elf ;;
+  arm-*-netbsdelf*-*eabihf*)           fmt=elf  em=armnbsdeabihf ;;
+  arm-*-netbsdelf*-*eabi*)             fmt=elf  em=armnbsdeabi ;;
   arm-*-eabi*)                         fmt=elf em=armeabi ;;
   arm-*-symbianelf*)                   fmt=elf em=symbian ;;
   arm-*-kaos*)                         fmt=elf ;;
@@ -151,8 +153,6 @@
   arm-*-linux*aout*)                   fmt=aout em=linux ;;
   arm-*-linux-*eabi*)                  fmt=elf  em=armlinuxeabi ;;
   arm-*-linux-*)                       fmt=elf  em=linux ;;
-  arm-*-netbsdelf*-*eabihf*)           fmt=elf  em=armnbsdeabihf ;;
-  arm-*-netbsdelf*-*eabi*)             fmt=elf  em=armnbsdeabi ;;
   arm-*-uclinux*eabi*)                 fmt=elf  em=armlinuxeabi ;;
   arm-*-uclinux*)                      fmt=elf  em=linux ;;
   arm-*-nacl*)                         fmt=elf  em=nacl ;;