diff options
| author | David Turner <digit@android.com> | 2011-06-06 12:57:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 12:57:08 -0700 |
| commit | 65fb884d28c26dc84d27bea6861b3a95a327db66 (patch) | |
| tree | 37d78b4b6c57c5e7b13fa1f453c3472e57b729b7 /linker | |
| parent | 1dae997ca4b67b40d2fe60ae65909403661db0af (diff) | |
| parent | 204d1f65dbfc6d5a14a90627d9d1efcfce8261ee (diff) | |
| download | bionic-65fb884d28c26dc84d27bea6861b3a95a327db66.zip bionic-65fb884d28c26dc84d27bea6861b3a95a327db66.tar.gz bionic-65fb884d28c26dc84d27bea6861b3a95a327db66.tar.bz2 | |
am 204d1f65: am b2c7e0c1: Merge "x86: Enable -fstack-protector"
* commit '204d1f65dbfc6d5a14a90627d9d1efcfce8261ee':
x86: Enable -fstack-protector
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/Android.mk | 1 | ||||
| -rw-r--r-- | linker/arch/x86/begin.S | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index abe5995..d958d6b 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -50,6 +50,7 @@ LOCAL_CFLAGS += -DANDROID_ARM_LINKER else ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += -DANDROID_X86_LINKER + LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/arch-x86/bionic else ifeq ($(TARGET_ARCH),sh) LOCAL_CFLAGS += -DANDROID_SH_LINKER diff --git a/linker/arch/x86/begin.S b/linker/arch/x86/begin.S index b4427e0..5be59cb 100644 --- a/linker/arch/x86/begin.S +++ b/linker/arch/x86/begin.S @@ -44,3 +44,5 @@ _start: popl %esp jmp *%eax + +#include "__stack_chk_fail_local.S" |