Module Name:    src
Committed By:   skrll
Date:           Thu May 12 12:51:53 UTC 2016

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

Log Message:
For earm use the compiler to determine sf vs hf


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils.old/dist/config.guess
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/config.guess
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc.old/dist/config.guess
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/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.old/dist/config.guess
diff -u src/external/gpl3/binutils.old/dist/config.guess:1.3 src/external/gpl3/binutils.old/dist/config.guess:1.4
--- src/external/gpl3/binutils.old/dist/config.guess:1.3	Thu May 12 10:55:03 2016
+++ src/external/gpl3/binutils.old/dist/config.guess	Thu May 12 12:51:53 2016
@@ -214,8 +214,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# Determine ABI tags.
 	case "${UNAME_MACHINE_ARCH}" in
 	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		eval $set_cc_for_build
+		if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ARM_PCS_VFP
+		then
+		    abi=-eabi
+		else
+		    abi=-eabihf
+		fi
 		;;
 	esac
 	# The OS release

Index: src/external/gpl3/binutils/dist/config.guess
diff -u src/external/gpl3/binutils/dist/config.guess:1.7 src/external/gpl3/binutils/dist/config.guess:1.8
--- src/external/gpl3/binutils/dist/config.guess:1.7	Thu May 12 10:55:03 2016
+++ src/external/gpl3/binutils/dist/config.guess	Thu May 12 12:51:53 2016
@@ -214,8 +214,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# Determine ABI tags.
 	case "${UNAME_MACHINE_ARCH}" in
 	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		eval $set_cc_for_build
+		if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ARM_PCS_VFP
+		then
+		    abi=-eabi
+		else
+		    abi=-eabihf
+		fi
 		;;
 	esac
 	# The OS release

Index: src/external/gpl3/gcc.old/dist/config.guess
diff -u src/external/gpl3/gcc.old/dist/config.guess:1.5 src/external/gpl3/gcc.old/dist/config.guess:1.6
--- src/external/gpl3/gcc.old/dist/config.guess:1.5	Thu May 12 10:55:03 2016
+++ src/external/gpl3/gcc.old/dist/config.guess	Thu May 12 12:51:53 2016
@@ -214,8 +214,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# Determine ABI tags.
 	case "${UNAME_MACHINE_ARCH}" in
 	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		eval $set_cc_for_build
+		if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ARM_PCS_VFP
+		then
+		    abi=-eabi
+		else
+		    abi=-eabihf
+		fi
 		;;
 	esac
 	# The OS release

Index: src/external/gpl3/gcc/dist/config.guess
diff -u src/external/gpl3/gcc/dist/config.guess:1.10 src/external/gpl3/gcc/dist/config.guess:1.11
--- src/external/gpl3/gcc/dist/config.guess:1.10	Thu May 12 10:55:03 2016
+++ src/external/gpl3/gcc/dist/config.guess	Thu May 12 12:51:53 2016
@@ -214,8 +214,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# Determine ABI tags.
 	case "${UNAME_MACHINE_ARCH}" in
 	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		eval $set_cc_for_build
+		if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ARM_PCS_VFP
+		then
+		    abi=-eabi
+		else
+		    abi=-eabihf
+		fi
 		;;
 	esac
 	# The OS release

Reply via email to