Module Name:    src
Committed By:   skrll
Date:           Wed Jan 11 14:13:05 UTC 2017

Modified Files:
        src/external/gpl3/binutils/dist/gas: configure.tgt

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/binutils/dist/gas/configure.tgt

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/gas/configure.tgt
diff -u src/external/gpl3/binutils/dist/gas/configure.tgt:1.11 src/external/gpl3/binutils/dist/gas/configure.tgt:1.12
--- src/external/gpl3/binutils/dist/gas/configure.tgt:1.11	Wed Oct 26 18:42:55 2016
+++ src/external/gpl3/binutils/dist/gas/configure.tgt	Wed Jan 11 14:13:05 2017
@@ -140,6 +140,8 @@ case ${generic_target} in
   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 @@ case ${generic_target} in
   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 ;;

Reply via email to