aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.7/gcc/config/arm
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-10-23 19:56:28 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-10-23 19:56:28 +0800
commit7e66b0108987a56a58c6150672fe7cf8cf88e69a (patch)
treef0b43e52e3394087fb8e9df0f99b56ce589d52b3 /gcc-4.7/gcc/config/arm
parent20c5bf758150dcfc13af1fce22e20256d29e150a (diff)
downloadtoolchain_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.7/gcc/config/arm')
-rw-r--r--gcc-4.7/gcc/config/arm/elf.h6
-rw-r--r--gcc-4.7/gcc/config/arm/linux-eabi.h5
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc-4.7/gcc/config/arm/elf.h b/gcc-4.7/gcc/config/arm/elf.h
index e0a0aa06c..417adf8a2 100644
--- a/gcc-4.7/gcc/config/arm/elf.h
+++ b/gcc-4.7/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} \
%(asm_cpu_spec) \
@@ -62,6 +61,9 @@
%{mthumb-interwork:-mthumb-interwork} \
%{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.7/gcc/config/arm/linux-eabi.h b/gcc-4.7/gcc/config/arm/linux-eabi.h
index 80bd82593..af13e35f0 100644
--- a/gcc-4.7/gcc/config/arm/linux-eabi.h
+++ b/gcc-4.7/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, \