Index: config.guess
===================================================================
RCS file: /cvsroot/src/external/gpl3/binutils/dist/config.guess,v
retrieving revision 1.7
diff -u -p -r1.7 config.guess
--- config.guess	12 May 2016 10:55:03 -0000	1.7
+++ config.guess	12 May 2016 11:35:56 -0000
@@ -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