Index: arm/armhf/armv7/Implies
===================================================================
--- arm/armhf/armv7/Implies	(revision 0)
+++ arm/armhf/armv7/Implies	(revision 0)
@@ -0,0 +1 @@
+arm/armv7
Index: arm/armhf/armv6t2/Implies
===================================================================
--- arm/armhf/armv6t2/Implies	(revision 0)
+++ arm/armhf/armv6t2/Implies	(revision 0)
@@ -0,0 +1 @@
+arm/armv6t2
Index: arm/armhf/shlib-versions
===================================================================
--- arm/armhf/shlib-versions	(revision 0)
+++ arm/armhf/shlib-versions	(revision 0)
@@ -0,0 +1,6 @@
+# As of 2.16 the -mfloat-abi=hard ABI variant has a new unique
+# name for the dynamic loader.
+arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
+
+arm.*-.*-linux-gnueabi.*	ld=ld-linux-armhf.so.3
+
Index: arm/preconfigure
===================================================================
--- arm/preconfigure	(revision 18306)
+++ arm/preconfigure	(working copy)
@@ -34,7 +34,18 @@
 		  echo 2>&1 "arm/preconfigure: Did not find ARM architecture type; using default"
 		  ;;
 		esac
-
+		archcppflag=`echo "" |
+		$CC $CFLAGS $CPPFLAGS -E -dM - |
+		  grep __ARM_PCS_VFP |
+		  sed -e 's/^#define //' -e 's/ .*//'`
+		case x$archcppflag in
+		x__ARM_PCS_VFP)
+		  echo "Found compiler is configured for ARM hard-float ABI"
+		  machine=armhf/$machine
+		  ;;
+		*)
+		  ;;
+		esac
 		machine=arm/$machine
 		if [ "${CFLAGS+set}" != "set" ]; then
 		  CFLAGS="-g -O2"