Module Name:    src
Committed By:   matt
Date:           Fri Jul 19 15:55:57 UTC 2013

Modified Files:
        src/external/gpl3/binutils/dist: config.guess
        src/external/gpl3/gcc/dist: config.guess
        src/external/gpl3/gdb/dist: config.guess

Log Message:
Make these consistent.  Make sure all handle earm and coldfire.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/config.guess
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/config.guess
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/config.guess

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/config.guess
diff -u src/external/gpl3/binutils/dist/config.guess:1.2 src/external/gpl3/binutils/dist/config.guess:1.3
--- src/external/gpl3/binutils/dist/config.guess:1.2	Thu Jul 19 19:34:26 2012
+++ src/external/gpl3/binutils/dist/config.guess	Fri Jul 19 15:55:57 2013
@@ -160,14 +160,28 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	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 \

Index: src/external/gpl3/gcc/dist/config.guess
diff -u src/external/gpl3/gcc/dist/config.guess:1.3 src/external/gpl3/gcc/dist/config.guess:1.4
--- src/external/gpl3/gcc/dist/config.guess:1.3	Mon Apr 22 08:52:33 2013
+++ src/external/gpl3/gcc/dist/config.guess	Fri Jul 19 15:55:57 2013
@@ -158,10 +158,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
-	    earm*eb*) machine=armeb-unknown ;;
-	    earm*) machine=arm-unknown ;;
 	    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 ;;
@@ -170,6 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# 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 \

Index: src/external/gpl3/gdb/dist/config.guess
diff -u src/external/gpl3/gdb/dist/config.guess:1.1.1.1 src/external/gpl3/gdb/dist/config.guess:1.2
--- src/external/gpl3/gdb/dist/config.guess:1.1.1.1	Sat Sep 24 19:41:46 2011
+++ src/external/gpl3/gdb/dist/config.guess	Fri Jul 19 15:55:57 2013
@@ -160,6 +160,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# 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 \

Reply via email to