Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3 Make these consistent. Make sure all handle e...



details:   https://anonhg.NetBSD.org/src/rev/8fd38e885eba
branches:  trunk
changeset: 788781:8fd38e885eba
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jul 19 15:55:57 2013 +0000

description:
Make these consistent.  Make sure all handle earm and coldfire.

diffstat:

 external/gpl3/binutils/dist/config.guess |  16 +++++++++++++++-
 external/gpl3/gcc/dist/config.guess      |   6 ++++--
 external/gpl3/gdb/dist/config.guess      |  14 ++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diffs (89 lines):

diff -r 88321d02ea76 -r 8fd38e885eba external/gpl3/binutils/dist/config.guess
--- a/external/gpl3/binutils/dist/config.guess  Fri Jul 19 15:53:00 2013 +0000
+++ b/external/gpl3/binutils/dist/config.guess  Fri Jul 19 15:55:57 2013 +0000
@@ -160,14 +160,28 @@
        case "${UNAME_MACHINE_ARCH}" in
            armeb) machine=armeb-unknown ;;
            arm*) machine=arm-unknown ;;
+           coldfire) machine=m5407-unknown ;;
+           earm*eb*) machine=armeb-unknown ;;
+           earm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
            sh5el) machine=sh5le-unknown ;;
            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
-       # to ELF recently, or will in the future.
+       # to ELF recently, or will in the future and ABI.
        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
+               ;;
            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
diff -r 88321d02ea76 -r 8fd38e885eba external/gpl3/gcc/dist/config.guess
--- a/external/gpl3/gcc/dist/config.guess       Fri Jul 19 15:53:00 2013 +0000
+++ b/external/gpl3/gcc/dist/config.guess       Fri Jul 19 15:55:57 2013 +0000
@@ -158,10 +158,11 @@
        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
        case "${UNAME_MACHINE_ARCH}" in
+           armeb) machine=armeb-unknown ;;
+           arm*) machine=arm-unknown ;;
+           coldfire) machine=m5407-unknown ;;
            earm*eb*) machine=armeb-unknown ;;
            earm*) machine=arm-unknown ;;
-           armeb) machine=armeb-unknown ;;
-           arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
            sh5el) machine=sh5le-unknown ;;
@@ -170,6 +171,7 @@
        # The Operating System including object format, if it has switched
        # to ELF recently, or will in the future and ABI.
        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 \
diff -r 88321d02ea76 -r 8fd38e885eba external/gpl3/gdb/dist/config.guess
--- a/external/gpl3/gdb/dist/config.guess       Fri Jul 19 15:53:00 2013 +0000
+++ b/external/gpl3/gdb/dist/config.guess       Fri Jul 19 15:55:57 2013 +0000
@@ -160,6 +160,9 @@
        case "${UNAME_MACHINE_ARCH}" in
            armeb) machine=armeb-unknown ;;
            arm*) machine=arm-unknown ;;
+           coldfire) machine=m5407-unknown ;;
+           earm*eb) machine=armeb-unknown ;;
+           earm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
            sh5el) machine=sh5le-unknown ;;
@@ -168,6 +171,17 @@
        # The Operating System including object format, if it has switched
        # to ELF recently, or will in the future.
        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
+               ;;
            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \



Home | Main Index | Thread Index | Old Index