diff options
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/Android.mk | 1 | ||||
| -rw-r--r-- | linker/arch/x86/begin.S | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index 5ab48a09c..0cbaf366a 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -62,6 +62,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 d8a39ca32..5be59cb15 100644 --- a/linker/arch/x86/begin.S +++ b/linker/arch/x86/begin.S @@ -44,9 +44,5 @@ _start: popl %esp jmp *%eax -.section .ctors, "wa" -.globl __CTOR_LIST__ - -__CTOR_LIST__: - .long -1 +#include "__stack_chk_fail_local.S" |