diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-09-03 15:54:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-03 15:54:50 +0000 |
| commit | 9bba04175106d9b9e8a58715e3e7fa560c13e092 (patch) | |
| tree | d3f1ae9fe74536a677df0ea27632ac65fadb007f /gcc-4.9/gcc | |
| parent | 8a89bc750653a94826cbc238e749acfcda8625a1 (diff) | |
| parent | 63d8d5d58b9f5b3408dad136d4abc89113818649 (diff) | |
| download | toolchain_gcc-9bba04175106d9b9e8a58715e3e7fa560c13e092.tar.gz toolchain_gcc-9bba04175106d9b9e8a58715e3e7fa560c13e092.tar.bz2 toolchain_gcc-9bba04175106d9b9e8a58715e3e7fa560c13e092.zip | |
Merge "[4.8, 4.9] Fix broken ABI defaults for 32-bit x86 compiler"
Diffstat (limited to 'gcc-4.9/gcc')
| -rw-r--r-- | gcc-4.9/gcc/config/i386/gnu-user.h | 4 | ||||
| -rw-r--r-- | gcc-4.9/gcc/config/i386/gnu-user64.h | 5 | ||||
| -rw-r--r-- | gcc-4.9/gcc/config/i386/linux-common.h | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/gcc-4.9/gcc/config/i386/gnu-user.h b/gcc-4.9/gcc/config/i386/gnu-user.h index 21b9e9692..d4a16e470 100644 --- a/gcc-4.9/gcc/config/i386/gnu-user.h +++ b/gcc-4.9/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.9/gcc/config/i386/gnu-user64.h b/gcc-4.9/gcc/config/i386/gnu-user64.h index 1c72b41e4..0333b5c26 100644 --- a/gcc-4.9/gcc/config/i386/gnu-user64.h +++ b/gcc-4.9/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.9/gcc/config/i386/linux-common.h b/gcc-4.9/gcc/config/i386/linux-common.h index 574f096e6..d980fb719 100644 --- a/gcc-4.9/gcc/config/i386/linux-common.h +++ b/gcc-4.9/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, \ |