generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "x86: Enable -fstack-protector"

Browse Source
This commit is contained in:
David Turner 2011-05-24 17:43:27 -07:00 committed by Android Code Review
commit b2c7e0c18b
7 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -553,7 +553,7 @@ ifneq ($(filter arm x86,$(TARGET_ARCH)),)
GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o
$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.S
@mkdir -p $(dir $@)
$(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $<
$(TARGET_CC) $(libc_crt_target_cflags) -fPIC -o $@ -c $<
ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o

48
libc/arch-x86/bionic/__stack_chk_fail_local.S Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (C) 2011 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* Contributed by: Intel Corporation
*/
.text
.p2align 4,,15
.globl __stack_chk_fail_local
.hidden __stack_chk_fail_local
.type __stack_chk_fail_local, @function
__stack_chk_fail_local:
#ifdef __PIC__
pushl %ebx
call __x86.get_pc_thunk.bx
addl $_GLOBAL_OFFSET_TABLE_, %ebx
call __stack_chk_fail@PLT
#else /* PIC */
jmp __stack_chk_fail
#endif /* not PIC */
.size __stack_chk_fail_local, .-__stack_chk_fail_local

3
libc/arch-x86/bionic/crtbegin_dynamic.S
View File

@ -131,4 +131,7 @@ frame_dummy:
.comm object.4466,24,4
.weak __register_frame_info_bases
.weak __deregister_frame_info_bases
#include "__dso_handle.S"
#include "__stack_chk_fail_local.S"

1
libc/arch-x86/bionic/crtbegin_so.S
View File

@ -95,3 +95,4 @@ __x86.get_pc_thunk.bx:
ret
#include "__dso_handle.S"
#include "__stack_chk_fail_local.S"

2
libc/arch-x86/bionic/crtbegin_static.S
View File

@ -130,4 +130,6 @@ frame_dummy:
.comm object.4466,24,4
.weak __register_frame_info_bases
.weak __deregister_frame_info_bases
#include "__dso_handle.S"
#include "__stack_chk_fail_local.S"

1
linker/Android.mk
View File

@ -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

2
linker/arch/x86/begin.S
View File

@ -44,3 +44,5 @@ _start:
popl %esp
jmp *%eax
#include "__stack_chk_fail_local.S"