diff --git a/src/lj_arch.h b/src/lj_arch.h
index c0c2006d..9ff3c2b6 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -152,10 +152,10 @@
 #define LJ_ARCH_NAME		"arm"
 #define LJ_ARCH_BITS		32
 #define LJ_ARCH_ENDIAN		LUAJIT_LE
-#ifndef LJ_ARCH_HASFPU
+#if !defined(LJ_ARCH_HASFPU) && __SOFTFP__
 #define LJ_ARCH_HASFPU		0
 #endif
-#ifndef LJ_ABI_SOFTFP
+#if !defined(LJ_ABI_SOFTFP) && !__ARM_PCS_VFP
 #define LJ_ABI_SOFTFP		1
 #endif
 #define LJ_ABI_EABI		1
@@ -302,9 +302,6 @@
 #if defined(__ARMEB__)
 #error "No support for big-endian ARM"
 #endif
-#if defined(__ARM_PCS_VFP)
-#error "No support for ARM hard-float ABI (yet)"
-#endif
 #if __ARM_ARCH_6M__ || __ARM_ARCH_7M__ || __ARM_ARCH_7EM__
 #error "No support for Cortex-M CPUs"
 #endif