3 files changed, 2 insertions, 4 deletions
diff --git a/tests/abcc/jni/Abcc.h b/tests/abcc/jni/Abcc.h
index 4c9b1c42e..a9c53a772 100644
--- a/tests/abcc/jni/Abcc.h
+++ b/tests/abcc/jni/Abcc.h
@@ -98,10 +98,10 @@ const TargetAttributes kGlobalTargetAttrs[] = {
 #else
   {"arm", "thumbv7-linux-androideabi", "armelf_linux_eabi", ARM_BASE_CFLAGS, "-dynamic-linker /system/bin/linker"},
 #endif
-  {"x86", "i686-linux-android", "elf_i386", X86_BASE_CFLAGS, "-dynamic-linker /system/bin/linker"},
+  {"x86", "i686-linux-android", "elf_i386", "-disable-fp-elim -force-align-stack -mattr=+ssse3 -x86-force-gv-stack-cookie", "-dynamic-linker /system/bin/linker"},
   {"mips", "mipsel-linux-android", "elf32ltsmip", "-float-abi=hard", "-dynamic-linker /system/bin/linker"},
   {"arm64", "aarch64-linux-android", "aarch64linux", "", "-dynamic-linker /system/bin/linker64"},
-  {"x86_64", "x86_64-linux-android", "elf_x86_64", "-disable-fp-elim -force-align-stack -mattr=+sse3 -x86-force-gv-stack-cookie", "-dynamic-linker /system/bin/linker64"},
+  {"x86_64", "x86_64-linux-android", "elf_x86_64", "-disable-fp-elim -force-align-stack -mattr=+sse4.2,+popcnt -x86-force-gv-stack-cookie", "-dynamic-linker /system/bin/linker64"},
   {"mips64", "mips64el-linux-android", "elf64ltsmip", "", "-dynamic-linker /system/bin/linker64"},
 };
 
diff --git a/tests/abcc/jni/llvm_34.h b/tests/abcc/jni/llvm_34.h
index c00573251..41aaaa9e9 100644
--- a/tests/abcc/jni/llvm_34.h
+++ b/tests/abcc/jni/llvm_34.h
@@ -18,7 +18,6 @@
 #define ABCC_LLVM_34_H
 
 #define ARM_BASE_CFLAGS         "-arm-enable-ehabi -arm-enable-ehabi-descriptors -float-abi=soft"
-#define X86_BASE_CFLAGS         "-disable-fp-elim -force-align-stack -mattr=-ssse3,-sse41,-sse42,-sse4a,-popcnt -x86-force-gv-stack-cookie"
 
 #define OPTION_FUNCTION_SECTION "-ffunction-sections"
 
diff --git a/tests/abcc/jni/llvm_35.h b/tests/abcc/jni/llvm_35.h
index 99422673a..6279afe18 100644
--- a/tests/abcc/jni/llvm_35.h
+++ b/tests/abcc/jni/llvm_35.h
@@ -18,7 +18,6 @@
 #define ABCC_LLVM_35_H
 
 #define ARM_BASE_CFLAGS         "-float-abi=soft"
-#define X86_BASE_CFLAGS         "-disable-fp-elim -force-align-stack -mattr=-ssse3,-sse4.1,-sse4.2,-sse4a,-popcnt -x86-force-gv-stack-cookie"
 
 #define OPTION_FUNCTION_SECTION "-function-sections"