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

am 97b70b2b: Merge "Replace .S version of x86 crtfiles with .c version"

Browse Source 
* commit '97b70b2bda47af46adf58dfde61050357114aa1f':
  Replace .S version of x86 crtfiles with .c version
This commit is contained in:
Elliott Hughes 2012-11-30 10:13:57 -08:00 committed by Android Git Automerger
commit 4835e6ef51
9 changed files with 142 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -623,7 +623,7 @@ ifeq ($(TARGET_ARCH),mips)
libc_crt_target_so_cflags := -fPIC libc_crt_target_so_cflags := -fPIC
endif endif
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
libc_crtbegin_extension := S libc_crtbegin_extension := c
libc_crt_target_so_cflags := -fPIC libc_crt_target_so_cflags := -fPIC
endif endif
ifeq ($(libc_crtbegin_extension),) ifeq ($(libc_crtbegin_extension),)

46
libc/arch-x86/bionic/__stack_chk_fail_local.S → libc/arch-x86/bionic/__stack_chk_fail_local.h Normal file → Executable file
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011 The Android Open Source Project * Copyright (C) 2012 The Android Open Source Project
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -25,24 +25,36 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* /*
* Contributed by: Intel Corporation __stack_chk_fail routine is runtime part of stack protector compiler
*/ feature. It's implemented in libc and represents die routine when stack
corruption is detected.
.text Calls are generated by compiler and injected into user functions when
.p2align 4,,15 -fstack-protector* options are used.
.globl __stack_chk_fail_local
.hidden __stack_chk_fail_local
.type __stack_chk_fail_local, @function
__stack_chk_fail_local: __stack_chk_fail_local is wrapper for __stack_chk_fail. Compiler generates
wrapper calls instead for PIC code only and only on IA32 for optimization
purpose (see gcc/config/i386/i386.c). Wrapper body is always included into
executable or library. This is the idea of optimization.
Glibc is doing this via libc_nonshared.a which is linked automatically
everytime with libc.so. In bionic we have to bring it within crtfiles
because libc.so is real library and not a link script like libc.so at glibc.
For x86_64 or non-PIC code compiler always generates __stack_chk_fail calls.
*/
#ifdef __i386__
#ifdef __PIC__ #ifdef __PIC__
pushl %ebx extern void __stack_chk_fail();
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 __attribute__ ((visibility ("hidden")))
void __stack_chk_fail_local()
{
__stack_chk_fail();
}
#endif
#endif

19
libc/arch-x86/bionic/__dso_handle_so.S → libc/arch-x86/bionic/atexit.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010 The Android Open Source Project * Copyright (C) 2012 The Android Open Source Project
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -26,13 +26,10 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
# The __dso_handle global variable is used by static extern void *__dso_handle;
# C++ constructors and destructors in the binary.
# See http://www.codesourcery.com/public/cxx-abi/abi.html#dso-dtor __attribute__ ((visibility ("hidden")))
# int atexit(void (*func)(void))
.data {
.align 4 return (__cxa_atexit((void (*)(void *))func, (void *)0, &__dso_handle));
.hidden __dso_handle }
.globl __dso_handle
__dso_handle:
.long __dso_handle

138
libc/arch-x86/bionic/crtbegin.S
View File

@ -1,138 +0,0 @@
# bionic/arch-x86/bionic/crtbegin_dynamic.S
#
# Copyright 2006, The Android Open Source Project
#
# 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.
# * Neither the name of Google Inc. nor the names of its contributors may
# be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY Google Inc. ``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 Google Inc. 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.
.text
.align 4
.type _start, @function
.globl _start
# this is the small startup code that is first run when
# any executable that is linked with Bionic runs.
#
# it's purpose is to call __libc_init with appropriate
# arguments, which are:
#
# - the address of the raw data block setup by the Linux
# kernel ELF loader
#
# - address of an "onexit" function, not used on any
# platform supported by Bionic
#
# - address of the "main" function of the program. We
# can't hard-code it in the adr pseudo instruction
# so we use a tiny trampoline that will get relocated
# by the dynamic linker before this code runs
#
# - address of the constructor list
#
_start:
mov %esp, %eax
# before push arguments, align the stack to a 16 byte boundary
andl $~15, %esp
mov $1f, %edx
pushl %edx
mov $0f, %edx
pushl %edx
mov $0, %edx
pushl %edx
pushl %eax
call __libc_init
0:
jmp main
1: .long __PREINIT_ARRAY__
.long __INIT_ARRAY__
.long __FINI_ARRAY__
.section .preinit_array, "aw"
.globl __PREINIT_ARRAY__
__PREINIT_ARRAY__:
.long -1
.section .init_array, "aw"
.globl __INIT_ARRAY__
__INIT_ARRAY__:
.long -1
.long frame_dummy
.section .fini_array, "aw"
.globl __FINI_ARRAY__
__FINI_ARRAY__:
.long -1
.long __do_global_dtors_aux
.section .eh_frame,"a",@progbits
.align 4
.type __EH_FRAME_BEGIN__, @object
__EH_FRAME_BEGIN__:
.text
.p2align 4,,15
.type __do_global_dtors_aux, @function
__do_global_dtors_aux:
pushl %ebp
movl %esp, %ebp
subl $24, %esp
cmpb $0, completed.4454
jne .L4
movl $__deregister_frame_info_bases, %eax
testl %eax, %eax
je .L3
movl $__EH_FRAME_BEGIN__, (%esp)
call __deregister_frame_info_bases
.L3:
movb $1, completed.4454
.L4:
leave
ret
.text
.p2align 4,,15
.type frame_dummy, @function
frame_dummy:
pushl %ebp
movl $__register_frame_info_bases, %eax
movl %esp, %ebp
subl $24, %esp
testl %eax, %eax
je .L7
movl %ebx, 12(%esp)
movl $0, 8(%esp)
movl $object.4466, 4(%esp)
movl $__EH_FRAME_BEGIN__, (%esp)
call __register_frame_info_bases
.L7:
leave
ret
.local completed.4454
.comm completed.4454,1,1
.local object.4466
.comm object.4466,24,4
.weak __register_frame_info_bases
.weak __deregister_frame_info_bases
#include "__dso_handle.S"
#include "atexit.S"
#include "__stack_chk_fail_local.S"

82
libc/arch-x86/bionic/atexit.S → libc/arch-x86/bionic/crtbegin.c Normal file → Executable file
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008 The Android Open Source Project * Copyright (C) 2012 The Android Open Source Project
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -25,42 +25,46 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
.text
.p2align 4,,15
.globl atexit
.hidden atexit
.type atexit, @function
atexit:
pushl %ebp
movl %esp, %ebp
pushl %ebx
call __x86.get_pc_thunk.bx
addl $_GLOBAL_OFFSET_TABLE_, %ebx
subl $20, %esp
movl $0, 4(%esp)
movl __dso_handle@GOTOFF(%ebx), %eax
movl %eax, 8(%esp)
movl 8(%ebp), %eax
movl %eax, (%esp)
call __cxa_atexit@PLT
addl $20, %esp
popl %ebx
popl %ebp
ret
.size atexit, .-atexit
.section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat typedef struct
.globl __x86.get_pc_thunk.bx {
.hidden __x86.get_pc_thunk.bx void (**preinit_array)(void);
.type __x86.get_pc_thunk.bx, @function void (**init_array)(void);
__x86.get_pc_thunk.bx: void (**fini_array)(void);
nop } structors_array_t;
nop
nop extern int main(int argc, char **argv, char **env);
nop
nop extern void __libc_init(
nop unsigned int *elfdata,
nop void (*onexit)(void),
nop int (*slingshot)(int, char**, char**),
movl (%esp), %ebx structors_array_t const * const structors
ret );
__attribute__ ((section (".preinit_array")))
void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1;
__attribute__ ((section (".init_array")))
void (*__INIT_ARRAY__)(void) = (void (*)(void)) -1;
__attribute__ ((section (".fini_array")))
void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1;
__attribute__((visibility("hidden")))
__attribute__((force_align_arg_pointer))
void _start() {
structors_array_t array;
void *elfdata;
array.preinit_array = &__PREINIT_ARRAY__;
array.init_array = &__INIT_ARRAY__;
array.fini_array = &__FINI_ARRAY__;
elfdata = __builtin_frame_address(0) + sizeof(void *);
__libc_init(elfdata, (void *) 0, &main, &array);
}
#include "__dso_handle.h"
#include "atexit.h"
#include "__stack_chk_fail_local.h"

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

@ -1,111 +0,0 @@
/*
* Copyright (C) 2008 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.
*/
.section .init_array, "aw"
.align 4
.type __INIT_ARRAY__, @object
.globl __INIT_ARRAY__
__INIT_ARRAY__:
.long -1
.long frame_dummy
.section .fini_array, "aw"
.align 4
.type __FINI_ARRAY__, @object
.globl __FINI_ARRAY__
__FINI_ARRAY__:
.long -1
.long __do_global_dtors_aux
.section .eh_frame,"a",@progbits
.align 4
.type __EH_FRAME_BEGIN__, @object
__EH_FRAME_BEGIN__:
.text
.p2align 4,,15
.type __do_global_dtors_aux, @function
__do_global_dtors_aux:
pushl %ebp
movl %esp, %ebp
pushl %ebx
call __x86.get_pc_thunk.bx
addl $_GLOBAL_OFFSET_TABLE_, %ebx
subl $20, %esp
cmpb $0, completed.4454@GOTOFF(%ebx)
jne .L5
movl __dso_handle@GOTOFF(%ebx), %eax
movl %eax, (%esp)
call __cxa_finalize@PLT
movl __deregister_frame_info_bases@GOT(%ebx), %eax
testl %eax, %eax
je .L4
leal __EH_FRAME_BEGIN__@GOTOFF(%ebx), %eax
movl %eax, (%esp)
call __deregister_frame_info_bases@PLT
.L4:
movb $1, completed.4454@GOTOFF(%ebx)
.L5:
addl $20, %esp
popl %ebx
popl %ebp
ret
.text
.p2align 4,,15
.type frame_dummy, @function
frame_dummy:
pushl %ebp
movl %esp, %ebp
pushl %ebx
call __x86.get_pc_thunk.bx
addl $_GLOBAL_OFFSET_TABLE_, %ebx
subl $20, %esp
movl __register_frame_info_bases@GOT(%ebx), %eax
testl %eax, %eax
je .L8
leal object.4469@GOTOFF(%ebx), %eax
movl %eax, 4(%esp)
leal __EH_FRAME_BEGIN__@GOTOFF(%ebx), %eax
movl %ebx, 12(%esp)
movl $0, 8(%esp)
movl %eax, (%esp)
call __register_frame_info_bases@PLT
.L8:
addl $20, %esp
popl %ebx
popl %ebp
ret
.local completed.4454
.comm completed.4454,1,1
.local object.4469
.comm object.4469,24,4
.weak __register_frame_info_bases
.weak __deregister_frame_info_bases
#include "__dso_handle_so.S"
#include "atexit.S"
#include "__stack_chk_fail_local.S"

43
libc/arch-x86/bionic/__dso_handle.S → libc/arch-x86/bionic/crtbegin_so.c Normal file → Executable file
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010 The Android Open Source Project * Copyright (C) 2012 The Android Open Source Project
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -26,17 +26,34 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
# The __dso_handle global variable is used by static extern void __cxa_finalize(void *);
# C++ constructors and destructors in the binary. extern void *__dso_handle;
# See http://www.codesourcery.com/public/cxx-abi/abi.html#dso-dtor
#
.section .bss
.align 4
#ifndef CRT_LEGACY_WORKAROUND __attribute__((visibility("hidden"),destructor))
.hidden __dso_handle void __on_dlclose() {
__cxa_finalize(&__dso_handle);
}
/* CRT_LEGACY_WORKAROUND should only be defined when building
* this file as part of the platform's C library.
*
* The C library already defines a function named 'atexit()'
* for backwards compatibility with older NDK-generated binaries.
*
* For newer ones, 'atexit' is actually embedded in the C
* runtime objects that are linked into the final ELF
* binary (shared library or executable), and will call
* __cxa_atexit() in order to un-register any atexit()
* handler when a library is unloaded.
*
* This function must be global *and* hidden. Only the
* code inside the same ELF binary should be able to access it.
*/
#ifdef CRT_LEGACY_WORKAROUND
#include "__dso_handle.h"
#else
#include "__dso_handle_so.h"
#include "atexit.h"
#include "__stack_chk_fail_local.h"
#endif #endif
.globl __dso_handle
__dso_handle:
.long 0

8
linker/Android.mk
View File

@ -1,8 +1,14 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifeq ($(TARGET_ARCH),x86)
linker_begin_extension := c
else
linker_begin_extension := S
endif
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
arch/$(TARGET_ARCH)/begin.S \ arch/$(TARGET_ARCH)/begin.$(linker_begin_extension) \
debugger.cpp \ debugger.cpp \
dlfcn.cpp \ dlfcn.cpp \
linker.cpp \ linker.cpp \

36
linker/arch/x86/begin.S → linker/arch/x86/begin.c Normal file → Executable file
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008 The Android Open Source Project * Copyright (C) 2012 The Android Open Source Project
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -26,22 +26,30 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
.text extern unsigned __linker_init(unsigned int *elfdata);
.align 4
.type _start, @function
.globl _start
_start: __attribute__((visibility("hidden")))
/* save the elfdata ptr to %eax, AND push it onto the stack */ void _start() {
mov %esp, %eax void *elfdata;
pushl %esp void (*start)(void);
pushl %eax elfdata = __builtin_frame_address(0) + sizeof(void *);
call __linker_init start = (void(*)(void))__linker_init(elfdata);
/* linker init returns (%eax) the _entry address in the main image */ /* linker init returns (%eax) the _entry address in the main image */
/* entry point expects sp to point to elfdata */ /* entry point expects sp to point to elfdata */
popl %esp
jmp *%eax
#include "arch-x86/bionic/__stack_chk_fail_local.S" __asm__ (
"mov %0, %%esp\n\t"
"jmp *%1\n\t"
: : "r"(elfdata), "r"(start) :
);
/* Unreachable */
}
/* Since linker has its own version of crtbegin (this file) it should have */
/* own version of __stack_chk_fail_local for the case when it's built with */
/* stack protector feature */
#include "arch-x86/bionic/__stack_chk_fail_local.h"