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

am 6d923d49: am 14102932: Merge "Move common arch-* code to arch-common directory"

Browse Source 
* commit '6d923d497373c160f6fdddd42f5ed56e7bf0923a':
  Move common arch-* code to arch-common directory
This commit is contained in:
Elliott Hughes 2013-10-04 09:58:23 -07:00 committed by Android Git Automerger
commit be7b6408b3
12 changed files with 60 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libc/Android.mk
View File

@ -657,18 +657,20 @@ libc_crt_target_cflags += \
# that will call __cxa_finalize(&__dso_handle) in order to ensure that # that will call __cxa_finalize(&__dso_handle) in order to ensure that
# static C++ destructors are properly called on dlclose(). # static C++ destructors are properly called on dlclose().
# #
libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-common/bionic/crtbegin.c
libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-common/bionic/crtbegin_so.c
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)
libc_crt_target_so_cflags := libc_crt_target_so_cflags :=
endif endif
ifeq ($(TARGET_ARCH),mips) ifeq ($(TARGET_ARCH),mips)
libc_crt_target_so_cflags := -fPIC libc_crt_target_so_cflags := -fPIC
libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c
endif endif
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
libc_crt_target_so_cflags := -fPIC libc_crt_target_so_cflags := -fPIC
endif endif
libc_crt_target_so_cflags += $(libc_crt_target_cflags) libc_crt_target_so_cflags += $(libc_crt_target_cflags)
libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c
libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin_so.c
# See the comment in crtbrand.c for the reason why we need to generate # See the comment in crtbrand.c for the reason why we need to generate
# crtbrand.s before generating crtbrand.o. # crtbrand.s before generating crtbrand.o.
@ -698,7 +700,7 @@ $(GEN): $(libc_crt_target_crtbegin_so_file)
ALL_GENERATED_SOURCES += $(GEN) ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend_so.S $(GEN): $(LOCAL_PATH)/arch-common/bionic/crtend_so.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) \ $(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $< -MD -MF $(@:%.o=%.d) -o $@ -c $<
@ -751,7 +753,7 @@ ALL_GENERATED_SOURCES += $(GEN)
# We rename crtend.o to crtend_android.o to avoid a # We rename crtend.o to crtend_android.o to avoid a
# name clash between gcc and bionic. # name clash between gcc and bionic.
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
$(GEN): $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtend.S $(GEN): $(LOCAL_PATH)/arch-common/bionic/crtend.S
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(TARGET_CC) $(libc_crt_target_cflags) \ $(hide) $(TARGET_CC) $(libc_crt_target_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $< -MD -MF $(@:%.o=%.d) -o $@ -c $<
@ -990,10 +992,10 @@ ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DCRT_LEGACY_WORKAROUND LOCAL_CFLAGS += -DCRT_LEGACY_WORKAROUND
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
arch-arm/bionic/crtbegin_so.c \ arch-common/bionic/crtbegin_so.c \
arch-arm/bionic/atexit_legacy.c \ arch-arm/bionic/atexit_legacy.c \
$(LOCAL_SRC_FILES) \ $(LOCAL_SRC_FILES) \
arch-arm/bionic/crtend_so.S arch-common/bionic/crtend_so.S
endif endif
LOCAL_MODULE:= libc LOCAL_MODULE:= libc

53
libc/arch-arm/bionic/crtbegin.c
View File

@ -1,53 +0,0 @@
/*
* Copyright (C) 2012 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.
*/
#include "../../bionic/libc_init_common.h"
#include <stddef.h>
#include <stdint.h>
__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;
__LIBC_HIDDEN__ void _start() {
structors_array_t array;
array.preinit_array = &__PREINIT_ARRAY__;
array.init_array = &__INIT_ARRAY__;
array.fini_array = &__FINI_ARRAY__;
void* raw_args = (void*) ((uintptr_t) __builtin_frame_address(0) + sizeof(void*));
__libc_init(raw_args, NULL, &main, &array);
}
#include "__dso_handle.h"
#include "atexit.h"

11
libc/arch-arm/bionic/crtend_so.S → libc/arch-common/bionic/asm_multiarch.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010 The Android Open Source Project * Copyright (C) 2013 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,6 +26,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#if defined(__linux__) && defined(__ELF__) #ifdef __LP64__
.section .note.GNU-stack,"",%progbits # define ASM_PTR_SIZE(x) .quad x
# define ASM_ALIGN(x) .align 4
#else
# define ASM_PTR_SIZE(x) .long x
# define ASM_ALIGN(x)
#endif #endif

0
libc/arch-arm/bionic/atexit.h → libc/arch-common/bionic/atexit.h
View File

6
libc/arch-x86/bionic/crtbegin.c → libc/arch-common/bionic/crtbegin.c
View File

@ -40,7 +40,9 @@ __attribute__ ((section (".fini_array")))
void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1; void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1;
__LIBC_HIDDEN__ __LIBC_HIDDEN__
#ifdef __i386__
__attribute__((force_align_arg_pointer)) __attribute__((force_align_arg_pointer))
#endif
void _start() { void _start() {
structors_array_t array; structors_array_t array;
array.preinit_array = &__PREINIT_ARRAY__; array.preinit_array = &__PREINIT_ARRAY__;
@ -53,4 +55,6 @@ void _start() {
#include "__dso_handle.h" #include "__dso_handle.h"
#include "atexit.h" #include "atexit.h"
#include "__stack_chk_fail_local.h" #ifdef __i386__
# include "../../arch-x86/bionic/__stack_chk_fail_local.h"
#endif

10
libc/arch-arm/bionic/crtbegin_so.c → libc/arch-common/bionic/crtbegin_so.c
View File

@ -51,8 +51,12 @@ void __on_dlclose() {
*/ */
#ifdef CRT_LEGACY_WORKAROUND #ifdef CRT_LEGACY_WORKAROUND
#include "__dso_handle.h" # include "__dso_handle.h"
#else #else
#include "__dso_handle_so.h" # include "__dso_handle_so.h"
#include "atexit.h" # include "atexit.h"
#endif #endif
#ifdef __i386__
# include "../../arch-x86/bionic/__stack_chk_fail_local.h"
#endif

18
libc/arch-arm/bionic/crtend.S → libc/arch-common/bionic/crtend.S
View File

@ -25,16 +25,26 @@
* 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.
*/ */
#include "asm_multiarch.h"
.section .preinit_array, "aw" .section .preinit_array, "aw"
.long 0 ASM_PTR_SIZE(0)
.section .init_array, "aw" .section .init_array, "aw"
.long 0 ASM_PTR_SIZE(0)
.section .fini_array, "aw" .section .fini_array, "aw"
.long 0 ASM_PTR_SIZE(0)
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits .section .note.GNU-stack,"",%progbits
#endif #endif
#if defined(__i386__) || defined(__x86_64__)
.section .eh_frame,"a",@progbits
ASM_ALIGN(4)
.type __FRAME_END__, @object
.size __FRAME_END__, 4
__FRAME_END__:
.zero 4
#endif

24
libc/arch-mips/bionic/crtend.S → libc/arch-common/bionic/crtend_so.S
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008 The Android Open Source Project * Copyright (C) 2013 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,13 +25,25 @@
* 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.
*/ */
.section .preinit_array, "aw"
.long 0
#include "asm_multiarch.h"
#ifndef __arm__
.section .init_array, "aw" .section .init_array, "aw"
.long 0 ASM_PTR_SIZE(0)
.section .fini_array, "aw" .section .fini_array, "aw"
.long 0 ASM_PTR_SIZE(0)
#endif
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits
#endif
#if defined(__i386__) || defined(__x86_64__)
.section .eh_frame,"a",@progbits
ASM_ALIGN(4)
.type __FRAME_END__, @object
.size __FRAME_END__, 4
__FRAME_END__:
.zero 4
#endif

5
libc/arch-mips/bionic/crtend_so.S
View File

@ -1,5 +0,0 @@
.section .init_array, "aw"
.long 0
.section .fini_array, "aw"
.long 0

59
libc/arch-x86/bionic/crtbegin_so.c
View File

@ -1,59 +0,0 @@
/*
* Copyright (C) 2012 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.
*/
extern void __cxa_finalize(void *);
extern void *__dso_handle;
__attribute__((visibility("hidden"),destructor))
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

15
libc/arch-x86/bionic/crtend.S
View File

@ -1,15 +0,0 @@
.section .preinit_array, "aw"
.long 0
.section .init_array, "aw"
.long 0
.section .fini_array, "aw"
.long 0
.section .eh_frame,"a",@progbits
.align 4
.type __FRAME_END__, @object
.size __FRAME_END__, 4
__FRAME_END__:
.zero 4

12
libc/arch-x86/bionic/crtend_so.S
View File

@ -1,12 +0,0 @@
.section .init_array, "aw"
.long 0
.section .fini_array, "aw"
.long 0
.section .eh_frame,"a",@progbits
.align 4
.type __FRAME_END__, @object
.size __FRAME_END__, 4
__FRAME_END__:
.zero 4