diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 19:56:28 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-10-23 19:56:28 +0800 |
| commit | 7e66b0108987a56a58c6150672fe7cf8cf88e69a (patch) | |
| tree | f0b43e52e3394087fb8e9df0f99b56ce589d52b3 /gcc-4.6 | |
| parent | 20c5bf758150dcfc13af1fce22e20256d29e150a (diff) | |
| download | toolchain_gcc-7e66b0108987a56a58c6150672fe7cf8cf88e69a.tar.gz toolchain_gcc-7e66b0108987a56a58c6150672fe7cf8cf88e69a.tar.bz2 toolchain_gcc-7e66b0108987a56a58c6150672fe7cf8cf88e69a.zip | |
Enable assembler linker default for security
Used to be local NDK patch at $NDK/build/tools/toolchain-patches/
gcc/0009-Enable-assembler-linker-default-for-security.patch
Change-Id: I0211ee770e9d4db036361390fcb5892d4e39356f
Diffstat (limited to 'gcc-4.6')
| -rw-r--r-- | gcc-4.6/gcc/config/arm/elf.h | 6 | ||||
| -rw-r--r-- | gcc-4.6/gcc/config/arm/linux-eabi.h | 5 | ||||
| -rw-r--r-- | gcc-4.6/gcc/config/i386/linux.h | 3 | ||||
| -rw-r--r-- | gcc-4.6/gcc/config/linux-android.h | 5 | ||||
| -rw-r--r-- | gcc-4.6/gcc/config/mips/linux.h | 3 |
5 files changed, 17 insertions, 5 deletions
diff --git a/gcc-4.6/gcc/config/arm/elf.h b/gcc-4.6/gcc/config/arm/elf.h index 88400884e..44d840b39 100644 --- a/gcc-4.6/gcc/config/arm/elf.h +++ b/gcc-4.6/gcc/config/arm/elf.h @@ -52,8 +52,7 @@ #undef SUBSUBTARGET_EXTRA_SPECS #define SUBSUBTARGET_EXTRA_SPECS -#ifndef ASM_SPEC -#define ASM_SPEC "\ +#define LINUX_ASM_SPEC "\ %{mbig-endian:-EB} \ %{mlittle-endian:-EL} \ %{mcpu=*:-mcpu=%*} \ @@ -64,6 +63,9 @@ %{msoft-float:-mfloat-abi=soft} %{mhard-float:-mfloat-abi=hard} \ %{mfloat-abi=*} %{mfpu=*} \ %(subtarget_extra_asm_spec)" + +#ifndef ASM_SPEC +#define ASM_SPEC LINUX_ASM_SPEC #endif /* The ARM uses @ are a comment character so we need to redefine diff --git a/gcc-4.6/gcc/config/arm/linux-eabi.h b/gcc-4.6/gcc/config/arm/linux-eabi.h index 3a3218853..2febcb293 100644 --- a/gcc-4.6/gcc/config/arm/linux-eabi.h +++ b/gcc-4.6/gcc/config/arm/linux-eabi.h @@ -79,6 +79,11 @@ #define CC1PLUS_SPEC \ LINUX_OR_ANDROID_CC ("", ANDROID_CC1PLUS_SPEC) +#undef ASM_SPEC +#define ASM_SPEC \ + LINUX_OR_ANDROID_CC (LINUX_ASM_SPEC, \ + LINUX_ASM_SPEC " " ANDROID_ASM_SPEC) + #undef LIB_SPEC #define LIB_SPEC \ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC, \ diff --git a/gcc-4.6/gcc/config/i386/linux.h b/gcc-4.6/gcc/config/i386/linux.h index 414dc65bf..5f0bcdbf6 100644 --- a/gcc-4.6/gcc/config/i386/linux.h +++ b/gcc-4.6/gcc/config/i386/linux.h @@ -104,7 +104,8 @@ along with GCC; see the file COPYING3. If not see #undef ASM_SPEC #define ASM_SPEC \ - "--32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + "--32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}} " \ + LINUX_OR_ANDROID_CC ("", ANDROID_ASM_SPEC) /* These may be provided by config/linux-grtev2.h. */ #ifndef LINUX_GRTE_EXTRA_SPECS diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h index acbc6627f..82346585a 100644 --- a/gcc-4.6/gcc/config/linux-android.h +++ b/gcc-4.6/gcc/config/linux-android.h @@ -39,7 +39,7 @@ "%{" NOANDROID "|tno-android-ld:" LINUX_SPEC ";:" ANDROID_SPEC "}" #define ANDROID_LINK_SPEC \ - "%{shared: -Bsymbolic}" + "%{shared: -Bsymbolic} -z noexecstack -z relro -z now" #define ANDROID_CC1_SPEC \ "%{!mglibc:%{!muclibc:%{!mbionic: -mbionic}}} " \ @@ -49,6 +49,9 @@ "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ "%{!frtti:%{!fno-rtti: -fno-rtti}}" +#define ANDROID_ASM_SPEC \ + "--noexecstack" + #define ANDROID_LIB_SPEC \ "%{!static: -ldl}" diff --git a/gcc-4.6/gcc/config/mips/linux.h b/gcc-4.6/gcc/config/mips/linux.h index a78f6bcbb..a1a8efc25 100644 --- a/gcc-4.6/gcc/config/mips/linux.h +++ b/gcc-4.6/gcc/config/mips/linux.h @@ -76,7 +76,8 @@ along with GCC; see the file COPYING3. If not see #undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC \ - "%{!mno-abicalls:%{mplt:-call_nonpic;:-KPIC}}" + "%{!mno-abicalls:%{mplt:-call_nonpic;:-KPIC}} " \ + LINUX_OR_ANDROID_CC ("", ANDROID_ASM_SPEC) /* The MIPS assembler has different syntax for .set. We set it to .dummy to trap any errors. */ |