diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 11:05:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-23 11:05:36 -0700 |
| commit | ae948abe78321551be84b54ea2b0230614f00670 (patch) | |
| tree | 0c7da1c542ddab2a3ef1f4bf79af73ad460bb114 /gcc-4.7/gcc/config | |
| parent | 7486fd3bda93a4e5c4c19584982d3da57c6b1044 (diff) | |
| parent | c779c1ff50bde450eb49b3998353804602c4d963 (diff) | |
| download | toolchain_gcc-ae948abe78321551be84b54ea2b0230614f00670.tar.gz toolchain_gcc-ae948abe78321551be84b54ea2b0230614f00670.tar.bz2 toolchain_gcc-ae948abe78321551be84b54ea2b0230614f00670.zip | |
Merge "Enable x86/arm gcc defaults"
Diffstat (limited to 'gcc-4.7/gcc/config')
| -rw-r--r-- | gcc-4.7/gcc/config/arm/linux-eabi.h | 2 | ||||
| -rw-r--r-- | gcc-4.7/gcc/config/i386/gnu-user.h | 10 | ||||
| -rw-r--r-- | gcc-4.7/gcc/config/linux-android.h | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/gcc-4.7/gcc/config/arm/linux-eabi.h b/gcc-4.7/gcc/config/arm/linux-eabi.h index af13e35f0..88811b7ec 100644 --- a/gcc-4.7/gcc/config/arm/linux-eabi.h +++ b/gcc-4.7/gcc/config/arm/linux-eabi.h @@ -74,7 +74,7 @@ #undef CC1_SPEC #define CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ - GNU_USER_TARGET_CC1_SPEC " " ANDROID_CC1_SPEC) + GNU_USER_TARGET_CC1_SPEC " " ANDROID_CC1_SPEC("-fpic")) #define CC1PLUS_SPEC \ LINUX_OR_ANDROID_CC ("", ANDROID_CC1PLUS_SPEC) diff --git a/gcc-4.7/gcc/config/i386/gnu-user.h b/gcc-4.7/gcc/config/i386/gnu-user.h index deb1341a2..12b00e164 100644 --- a/gcc-4.7/gcc/config/i386/gnu-user.h +++ b/gcc-4.7/gcc/config/i386/gnu-user.h @@ -83,7 +83,15 @@ along with GCC; see the file COPYING3. If not see #undef CC1_SPEC #define CC1_SPEC \ LINUX_OR_ANDROID_CC (LINUX_TARGET_CC1_SPEC, \ - LINUX_TARGET_CC1_SPEC " " ANDROID_CC1_SPEC) + LINUX_TARGET_CC1_SPEC \ + " -march=i686 -mtune=atom" \ + " -mstackrealign -msse3 -mfpmath=sse" \ + " -m32 -fno-short-enums" \ + " " \ + ANDROID_CC1_SPEC("-fPIC")) + +#define CC1PLUS_SPEC \ + LINUX_OR_ANDROID_CC ("", ANDROID_CC1PLUS_SPEC) /* Provide a LINK_SPEC appropriate for GNU userspace. Here we provide support for the special GCC options -static and -shared, which allow us to diff --git a/gcc-4.7/gcc/config/linux-android.h b/gcc-4.7/gcc/config/linux-android.h index 82346585a..033cfefd1 100644 --- a/gcc-4.7/gcc/config/linux-android.h +++ b/gcc-4.7/gcc/config/linux-android.h @@ -41,9 +41,9 @@ #define ANDROID_LINK_SPEC \ "%{shared: -Bsymbolic} -z noexecstack -z relro -z now" -#define ANDROID_CC1_SPEC \ +#define ANDROID_CC1_SPEC(ANDROID_PIC_DEFAULT) \ "%{!mglibc:%{!muclibc:%{!mbionic: -mbionic}}} " \ - "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: -fPIC}}}}" + "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" #define ANDROID_CC1PLUS_SPEC \ "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ |