diff --git a/configure b/configure
index 11ebf8c8..a400524a 100755
--- a/configure
+++ b/configure
@@ -51,7 +51,21 @@ case "$cpu" in
   x86_64)
     cpu="x86-64"
   ;;
-  arm|armv4l|armv5tel|armv5tejl|armv6j|armv6l|armv7a|armv7l)
+  arm*)
+    case "$cpu" in
+      arm|armv4l)
+        cpuver=4
+      ;;
+      armv5tel|armv5tejl)
+        cpuver=5
+      ;;
+      armv6j|armv6l)
+        cpuver=6
+      ;;
+      armv7a|armv7l)
+        cpuver=7
+      ;;
+    esac
     cpu="armv4l"
   ;;
   alpha)
@@ -411,6 +425,7 @@ elif test "$cpu" = "x86-64" ; then
 elif test "$cpu" = "armv4l" ; then
   echo "ARCH=arm" >> config.mak
   echo "#define HOST_ARM 1" >> $TMPH
+  echo "#define TCC_ARM_VERSION $cpuver" >> $TMPH
 elif test "$cpu" = "powerpc" ; then
   echo "ARCH=ppc" >> config.mak
   echo "#define HOST_PPC 1" >> $TMPH
diff --git a/tcc.h b/tcc.h
index 9e7c574b..9f818587 100644
--- a/tcc.h
+++ b/tcc.h
@@ -105,14 +105,6 @@
 #define TCC_TARGET_I386
 #endif
 
-#if defined (TCC_TARGET_ARM) && !defined(TCC_ARM_VERSION)
-  #ifdef TCC_ARM_HARDFLOAT
-    #define TCC_ARM_VERSION 7
-  #else
-    #define TCC_ARM_VERSION 4
-  #endif
-#endif
-
 #if !defined(TCC_UCLIBC) && !defined(TCC_TARGET_ARM) && \
     !defined(TCC_TARGET_C67) && !defined(TCC_TARGET_X86_64)
 #define CONFIG_TCC_BCHECK /* enable bound checking code */