3 files changed, 9 insertions, 5 deletions
diff --git a/gcc-4.8/gcc/config/i386/gnu-user.h b/gcc-4.8/gcc/config/i386/gnu-user.h
index 2f0a4d74a..d4fcd4c3c 100644
--- a/gcc-4.8/gcc/config/i386/gnu-user.h
+++ b/gcc-4.8/gcc/config/i386/gnu-user.h
@@ -65,6 +65,10 @@ along with GCC; see the file COPYING3.  If not see
    When the -shared link option is used a final link is not being
    done.  */
 
+#undef ANDROID_TARGET_CC1_SPEC
+#define ANDROID_TARGET_CC1_SPEC \
+  " -mstackrealign -mssse3 -fno-short-enums " \
+
 #undef  ASM_SPEC
 #define ASM_SPEC \
   "--32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}} " \
diff --git a/gcc-4.8/gcc/config/i386/gnu-user64.h b/gcc-4.8/gcc/config/i386/gnu-user64.h
index 952bb5b47..ad636a171 100644
--- a/gcc-4.8/gcc/config/i386/gnu-user64.h
+++ b/gcc-4.8/gcc/config/i386/gnu-user64.h
@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define SPEC_X32 "mx32"
 #endif
 
+#undef ANDROID_TARGET_CC1_SPEC
+#define ANDROID_TARGET_CC1_SPEC \
+  "%{m32:-mstackrealign -mssse3 -fno-short-enums}" \
+  "%{!m32:-msse4.2 -mpopcnt}"
+
 #undef ASM_SPEC
 #define ASM_SPEC "%{" SPEC_32 ":--32} \
  %{" SPEC_64 ":--64} \
diff --git a/gcc-4.8/gcc/config/i386/linux-common.h b/gcc-4.8/gcc/config/i386/linux-common.h
index fd10aefdf..ddbc33409 100644
--- a/gcc-4.8/gcc/config/i386/linux-common.h
+++ b/gcc-4.8/gcc/config/i386/linux-common.h
@@ -27,11 +27,6 @@ along with GCC; see the file COPYING3.  If not see
     }                                          \
   while (0)
 
-#undef ANDROID_TARGET_CC1_SPEC
-#define ANDROID_TARGET_CC1_SPEC \
-  "%{m32:-mstackrealign -mssse3 -fno-short-enums}" \
-  "%{!m32:-msse4.2 -mpopcnt}"
-
 #undef CC1_SPEC
 #define CC1_SPEC \
   LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \