diff --git a/arch/arm/bits/fenv.h b/arch/arm/bits/fenv.h
index 1d990221d60fcd4a75db8282bf7446b6471c6221..d85fc86d79476d160ce55024ced9eb5ea3324e78 100644
--- a/arch/arm/bits/fenv.h
+++ b/arch/arm/bits/fenv.h
@@ -1,4 +1,4 @@
-#ifdef __SOFTFP__
+#ifndef __ARM_PCS_VFP
 #define FE_ALL_EXCEPT 0
 #define FE_TONEAREST  0
 #else
diff --git a/configure b/configure
index 7aae7d4d46c387717feccbef8a10773425c6b802..949fb03d60ffdf77a0e4abba4fda620a892f9b92 100755
--- a/configure
+++ b/configure
@@ -381,7 +381,7 @@ t="$CFLAGS_C99FSE $CPPFLAGS $CFLAGS_AUTO $CFLAGS"
 
 if test "$ARCH" = "arm" ; then
 trycppif __ARMEB__ "$t" && SUBARCH=${SUBARCH}eb
-trycppif __SOFTFP__ "$t" || SUBARCH=${SUBARCH}hf
+trycppif __ARM_PCS_VFP "$t" && SUBARCH=${SUBARCH}hf
 fi
 
 test "$ARCH" = "mips" && trycppif "_MIPSEL || __MIPSEL || __MIPSEL__" "$t" \