diff options
| -rw-r--r-- | libc/Android.mk | 4 | ||||
| -rw-r--r-- | libc/arch-arm/bionic/crtbegin.S (renamed from libc/arch-arm/bionic/crtbegin_dynamic.S) | 3 | ||||
| -rw-r--r-- | libc/arch-arm/bionic/crtbegin_static.S | 87 | ||||
| -rw-r--r-- | libc/arch-x86/bionic/crtbegin.S (renamed from libc/arch-x86/bionic/crtbegin_dynamic.S) | 3 | ||||
| -rw-r--r-- | libc/arch-x86/bionic/crtbegin_static.S | 138 |
5 files changed, 4 insertions, 231 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 0dbc0be..77da9c8 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -574,13 +574,13 @@ endif # TARGET_ARCH == x86 || TARGET_ARCH == arm GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o -$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_static.S +$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.S @mkdir -p $(dir $@) $(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< ALL_GENERATED_SOURCES += $(GEN) GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o -$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_dynamic.S +$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.S @mkdir -p $(dir $@) $(TARGET_CC) $(libc_crt_target_cflags) -o $@ -c $< ALL_GENERATED_SOURCES += $(GEN) diff --git a/libc/arch-arm/bionic/crtbegin_dynamic.S b/libc/arch-arm/bionic/crtbegin.S index ec6d482..8843204 100644 --- a/libc/arch-arm/bionic/crtbegin_dynamic.S +++ b/libc/arch-arm/bionic/crtbegin.S @@ -31,8 +31,7 @@ .globl _start # this is the small startup code that is first run when -# any executable that is dynamically-linked with Bionic -# runs. +# any executable that is linked with Bionic runs. # # it's purpose is to call __libc_init with appropriate # arguments, which are: diff --git a/libc/arch-arm/bionic/crtbegin_static.S b/libc/arch-arm/bionic/crtbegin_static.S deleted file mode 100644 index 087ce36..0000000 --- a/libc/arch-arm/bionic/crtbegin_static.S +++ /dev/null @@ -1,87 +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. - */ - .text - .align 4 - .type _start,#function - .globl _start - -# this is the small startup code that is first run when -# any executable that is statically-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. -# -# - address of the constructor list -# -_start: - mov r0, sp - mov r1, #0 - ldr r2, =main - adr r3, 1f - ldr r4, =__libc_init - blx r4 - mov r0, #0 - bx r0 - -1: .long __PREINIT_ARRAY__ - .long __INIT_ARRAY__ - .long __FINI_ARRAY__ - .long __CTOR_LIST__ - - .section .preinit_array, "aw" - .globl __PREINIT_ARRAY__ -__PREINIT_ARRAY__: - .long -1 - - .section .init_array, "aw" - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - - .section .fini_array, "aw" - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - - .section .ctors, "aw" - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 - - -#include "__dso_handle.S" -#include "atexit.S" diff --git a/libc/arch-x86/bionic/crtbegin_dynamic.S b/libc/arch-x86/bionic/crtbegin.S index 177244b..39b6af0 100644 --- a/libc/arch-x86/bionic/crtbegin_dynamic.S +++ b/libc/arch-x86/bionic/crtbegin.S @@ -30,8 +30,7 @@ .globl _start # this is the small startup code that is first run when -# any executable that is dynamically-linked with Bionic -# runs. +# any executable that is linked with Bionic runs. # # it's purpose is to call __libc_init with appropriate # arguments, which are: diff --git a/libc/arch-x86/bionic/crtbegin_static.S b/libc/arch-x86/bionic/crtbegin_static.S deleted file mode 100644 index 4fffecd..0000000 --- a/libc/arch-x86/bionic/crtbegin_static.S +++ /dev/null @@ -1,138 +0,0 @@ -# bionic/arch-x86/bionic/crtbegin_static.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 statically-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" |