Fix conflict

[factor.git] / vm / cpu-x86.S

diff --git a/vm/cpu-x86.S b/vm/cpu-x86.S
index 5360d6c22730248e9e29990cc686ad43dd3b80df..52022e55ccb09ddaeef5b8701a5c0a7da9265d64 100644 (file)
--- a/vm/cpu-x86.S
+++ b/vm/cpu-x86.S
@@ -66,12 +66,12 @@ DEF(F_FASTCALL void,c_to_factor,(CELL quot, void *vm)):
 DEF(bool,sse_version,(void)):
        mov $0x1,RETURN_REG
        cpuid
-       /* test $0x100000,%ecx
+       test $0x100000,%ecx
        jnz sse_42
        test $0x80000,%ecx
        jnz sse_41
        test $0x200,%ecx
-       jnz ssse_3 */
+       jnz ssse_3
        test $0x1,%ecx
        jnz sse_3
        test $0x4000000,%edx