diff --git a/configure b/configure
index 5fe87b60fcd7a5..ef4de3e57cd42b 100755
--- a/configure
+++ b/configure
@@ -468,14 +468,14 @@ def configure_arm(o):
     arm_float_abi = 'default'
 
   if is_arch_armv7():
+    o['variables']['arm_fpu'] = 'vfpv3'
+    o['variables']['arm_neon'] = int(is_arm_neon())
     o['variables']['arm_version'] = '7'
-  elif is_arch_armv6():
-    o['variables']['arm_version'] = '6'
   else:
-    o['variables']['arm_version'] = 'default'
+    o['variables']['arm_fpu'] = 'vfpv2'
+    o['variables']['arm_neon'] = 0
+    o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default'
 
-  o['variables']['arm_fpu'] = 'vfpv3'  # V8 3.18 no longer supports VFP2.
-  o['variables']['arm_neon'] = int(is_arm_neon())
   o['variables']['arm_thumb'] = 0      # -marm
   o['variables']['arm_float_abi'] = arm_float_abi