[src/trunk]: src/external/gpl3 Doh... don't add the ABI to 'os'. Hopefully a...

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

details:   https://anonhg.NetBSD.org/src/rev/185f60e091bb
branches:  trunk
changeset: 345199:185f60e091bb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu May 12 10:55:03 2016 +0000

description:
Doh... don't add the ABI to 'os'.  Hopefully arm is really fixed now.

diffstat:

 external/gpl3/binutils.old/dist/config.guess |  11 ++---------
 external/gpl3/binutils/dist/config.guess     |   9 +--------
 external/gpl3/gcc.old/dist/config.guess      |   9 +--------
 external/gpl3/gcc/dist/config.guess          |   9 +--------
 4 files changed, 5 insertions(+), 33 deletions(-)

diffs (79 lines):

diff -r 19015dd5b0d2 -r 185f60e091bb external/gpl3/binutils.old/dist/config.guess
--- a/external/gpl3/binutils.old/dist/config.guess      Thu May 12 09:40:23 2016 +0000
+++ b/external/gpl3/binutils.old/dist/config.guess      Thu May 12 10:55:03 2016 +0000
@@ -193,16 +193,9 @@
        case "${UNAME_MACHINE_ARCH}" in
            coldfire) os=netbsdelf ;;
            earm*)
-               eval $set_cc_for_build
-               if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep -q __ARM_PCS_VFP
-               then
-                   os=netbsdelf-eabi
-               else
-                   os=netbsdelf-eabihf
-               fi
+               os=netbsdelf
                ;;
-           arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                        | grep -q __ELF__
diff -r 19015dd5b0d2 -r 185f60e091bb external/gpl3/binutils/dist/config.guess
--- a/external/gpl3/binutils/dist/config.guess  Thu May 12 09:40:23 2016 +0000
+++ b/external/gpl3/binutils/dist/config.guess  Thu May 12 10:55:03 2016 +0000
@@ -193,14 +193,7 @@
        case "${UNAME_MACHINE_ARCH}" in
            coldfire) os=netbsdelf ;;
            earm*)
-               eval $set_cc_for_build
-               if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep -q __ARM_PCS_VFP
-               then
-                   os=netbsdelf-eabi
-               else
-                   os=netbsdelf-eabihf
-               fi
+               os=netbsdelf
                ;;
            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
diff -r 19015dd5b0d2 -r 185f60e091bb external/gpl3/gcc.old/dist/config.guess
--- a/external/gpl3/gcc.old/dist/config.guess   Thu May 12 09:40:23 2016 +0000
+++ b/external/gpl3/gcc.old/dist/config.guess   Thu May 12 10:55:03 2016 +0000
@@ -193,14 +193,7 @@
        case "${UNAME_MACHINE_ARCH}" in
            coldfire) os=netbsdelf ;;
            earm*)
-               eval $set_cc_for_build
-               if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep -q __ARM_PCS_VFP
-               then
-                   os=netbsdelf-eabi
-               else
-                   os=netbsdelf-eabihf
-               fi
+               os=netbsdelf
                ;;
            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
diff -r 19015dd5b0d2 -r 185f60e091bb external/gpl3/gcc/dist/config.guess
--- a/external/gpl3/gcc/dist/config.guess       Thu May 12 09:40:23 2016 +0000
+++ b/external/gpl3/gcc/dist/config.guess       Thu May 12 10:55:03 2016 +0000
@@ -193,14 +193,7 @@
        case "${UNAME_MACHINE_ARCH}" in
            coldfire) os=netbsdelf ;;
            earm*)
-               eval $set_cc_for_build
-               if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep -q __ARM_PCS_VFP
-               then
-                   os=netbsdelf-eabi
-               else
-                   os=netbsdelf-eabihf
-               fi
+               os=netbsdelf
                ;;
            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build