Clean up ARM capability flags. Only set highest arch version.

1 files changed, 10 insertions, 4 deletions

diff --git a/src/lj_jit.h b/src/lj_jit.h
index 517b3264..1ec54fe7 100644
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -27,13 +27,19 @@
 #define JIT_F_CPU_FIRST         JIT_F_CMOV
 #define JIT_F_CPUSTRING         "\4CMOV\4SSE2\4SSE3\6SSE4.1\2P4\3AMD\2K8\4ATOM"
 #elif LJ_TARGET_ARM
-#define JIT_F_ARMV6             0x00000010
-#define JIT_F_ARMV6T2           0x00000020
+#define JIT_F_ARMV6_            0x00000010
+#define JIT_F_ARMV6T2_          0x00000020
 #define JIT_F_ARMV7             0x00000040
+#define JIT_F_VFPV2             0x00000080
+#define JIT_F_VFPV3             0x00000100
+
+#define JIT_F_ARMV6             (JIT_F_ARMV6_|JIT_F_ARMV6T2_|JIT_F_ARMV7)
+#define JIT_F_ARMV6T2           (JIT_F_ARMV6T2_|JIT_F_ARMV7)
+#define JIT_F_VFP               (JIT_F_VFPV2|JIT_F_VFPV3)
 
 /* Names for the CPU-specific flags. Must match the order above. */
-#define JIT_F_CPU_FIRST         JIT_F_ARMV6
-#define JIT_F_CPUSTRING         "\5ARMv6\7ARMv6T2\5ARMv7"
+#define JIT_F_CPU_FIRST         JIT_F_ARMV6_
+#define JIT_F_CPUSTRING         "\5ARMv6\7ARMv6T2\5ARMv7\5VFPv2\5VFPv3"
 #elif LJ_TARGET_PPC
 #define JIT_F_SQRT              0x00000010
 #define JIT_F_ROUND             0x00000020