diff --git a/ndk/platforms/android-9/arch-mips/src/__dso_handle.S b/ndk/platforms/android-9/arch-mips/src/atexit.h similarity index 79% rename from ndk/platforms/android-9/arch-mips/src/__dso_handle.S rename to ndk/platforms/android-9/arch-mips/src/atexit.h index 77a5d7fba..759008c84 100644 --- a/ndk/platforms/android-9/arch-mips/src/__dso_handle.S +++ b/ndk/platforms/android-9/arch-mips/src/atexit.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 The Android Open Source Project + * Copyright (C) 2013 The Android Open Source Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,13 +26,11 @@ * SUCH DAMAGE. */ -# The __dso_handle global variable is used by static -# C++ constructors and destructors in the binary. -# See http://www.codesourcery.com/public/cxx-abi/abi.html#dso-dtor -# - .data - .align 4 - .hidden __dso_handle - .globl __dso_handle -__dso_handle: - .long __dso_handle +extern void *__dso_handle; +extern int __cxa_atexit(void (*func)(void *), void *arg, void *dso); + +__attribute__ ((visibility ("hidden"))) +int atexit(void (*func)(void)) +{ + return (__cxa_atexit((void (*)(void *))func, (void *)0, &__dso_handle)); +} diff --git a/ndk/platforms/android-9/arch-mips/src/crtbegin.c b/ndk/platforms/android-9/arch-mips/src/crtbegin.c new file mode 100644 index 000000000..618e020c3 --- /dev/null +++ b/ndk/platforms/android-9/arch-mips/src/crtbegin.c @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2013 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 +#include +#include + +extern int main(int argc, char** argv, char** env); + +typedef struct +{ + void (**preinit_array)(void); + void (**init_array)(void); + void (**fini_array)(void); + void (**ctor_list)(void); + void (**dtor_list)(void); +} structors_array_t; + +__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__ ((section (".ctors"))) +void (*__CTOR_LIST__)(void) = (void (*)(void)) -1; + +__attribute__ ((section (".dtors"))) +void (*__DTOR_LIST__)(void) = (void (*)(void)) -1; + +__LIBC_HIDDEN__ void do_mips_start(void *raw_args) { + structors_array_t array; + array.preinit_array = &__PREINIT_ARRAY__; + array.init_array = &__INIT_ARRAY__; + array.fini_array = &__FINI_ARRAY__; + array.ctor_list = &__CTOR_LIST__; + array.dtor_list = &__DTOR_LIST__; + + __libc_init(raw_args, NULL, &main, &array); +} + +/* + * This function prepares the return address with a branch-and-link + * instruction (bal) and then uses a .cpload to compute the Global + * Offset Table (GOT) pointer ($gp). The $gp is then used to load + * the address of _do_start() into $t9 just before calling it. + * Terminating the stack with a NULL return address. + */ +__asm__ ( +" .set push \n" +" \n" +" .text \n" +" .align 4 \n" +" .type __start,@function \n" +" .globl __start \n" +" .globl _start \n" +" \n" +" .ent __start \n" +"__start: \n" +" _start: \n" +" .frame $sp,32,$ra \n" +" .mask 0x80000000,-4 \n" +" \n" +" .set noreorder \n" +" bal 1f \n" +" nop \n" +"1: \n" +" .cpload $ra \n" +" .set reorder \n" +" \n" +" move $a0, $sp \n" +" addiu $sp, $sp, (-32) \n" +" sw $0, 28($sp) \n" +" la $t9, do_mips_start \n" +" jalr $t9 \n" +" \n" +"2: b 2b \n" +" .end __start \n" +" \n" +" .set pop \n" +); + +#include "__dso_handle.h" +#include "atexit.h" diff --git a/ndk/platforms/android-9/arch-mips/src/crtbegin_dynamic.S b/ndk/platforms/android-9/arch-mips/src/crtbegin_dynamic.S deleted file mode 100644 index be42fb227..000000000 --- a/ndk/platforms/android-9/arch-mips/src/crtbegin_dynamic.S +++ /dev/null @@ -1,171 +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 - .globl _start - -# this is the small startup code that is first run when -# any executable that is dynamically-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 -# - - .ent __start -__start: -_start: - bal 1f -1: - .set noreorder - .cpload $ra - .set reorder - - move $a0, $sp - move $a1, $0 - la $a2, main - la $a3, 1f - subu $sp, 32 - la $t9, __libc_init -# Use jalr intead of jr so stack unwinding past __libc_init can terminate at _start - jalr $t9 - move $t9, $0 - j $t9 - .end __start - -1: .long __PREINIT_ARRAY__ - .long __INIT_ARRAY__ - .long __FINI_ARRAY__ - .long __CTOR_LIST__ - .long __DTOR_LIST__ - - .section .preinit_array, "aw" - .type __PREINIT_ARRAY__, @object - .globl __PREINIT_ARRAY__ -__PREINIT_ARRAY__: - .long -1 - - .section .init_array, "aw" - .type __INIT_ARRAY__, @object - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - - .section .fini_array, "aw" - .type __FINI_ARRAY__, @object - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - .long __do_global_dtors_aux - - .section .ctors, "aw" - .type __CTOR_LIST__, @object - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 - - .section .dtors, "aw" - .type __DTOR_LIST__, @object - .globl __DTOR_LIST__ -__DTOR_LIST__: - .long -1 - - .abicalls - .section .eh_frame,"a",@progbits - .align 2 - .type __EH_FRAME_BEGIN__, @object - .size __EH_FRAME_BEGIN__, 0 -__EH_FRAME_BEGIN__: - .text - .align 2 - .set nomips16 - .ent __do_global_dtors_aux - .type __do_global_dtors_aux, @function -__do_global_dtors_aux: - .frame $sp,32,$31 # vars= 0, regs= 1/0, args= 16, gp= 8 - .mask 0x80000000,-4 - .fmask 0x00000000,0 - .set noreorder - .cpload $25 - .set nomacro - addiu $sp,$sp,-32 - sw $31,28($sp) - .cprestore 16 - lw $2,%got(completed.1269)($28) - lbu $2,%lo(completed.1269)($2) - bne $2,$0,$L8 - nop - -$L4: - lw $2,%got(__cxa_finalize)($28) - beq $2,$0,$L6 - nop - - lw $2,%got(__dso_handle)($28) - lw $4,0($2) - lw $25,%call16(__cxa_finalize)($28) - .reloc 1f,R_MIPS_JALR,__cxa_finalize -1: jalr $25 - nop - - lw $28,16($sp) -$L6: - lw $2,%got(completed.1269)($28) - li $3,1 # 0x1 - sb $3,%lo(completed.1269)($2) -$L8: - lw $31,28($sp) - addiu $sp,$sp,32 - j $31 - nop - - .set macro - .set reorder - .end __do_global_dtors_aux - .size __do_global_dtors_aux, .-__do_global_dtors_aux - .local completed.1269 - .comm completed.1269,1,1 - .local object.1265 - .comm object.1265,24,4 - .weak __cxa_finalize - -.include "__dso_handle.S" -.include "atexit.S" - diff --git a/ndk/platforms/android-9/arch-mips/src/crtbegin_so.S b/ndk/platforms/android-9/arch-mips/src/crtbegin_so.S deleted file mode 100644 index 68dddfe3c..000000000 --- a/ndk/platforms/android-9/arch-mips/src/crtbegin_so.S +++ /dev/null @@ -1,94 +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" - .type __INIT_ARRAY__, @object - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - - .section .fini_array, "aw" - .type __FINI_ARRAY__, @object - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - .long __do_global_dtors_aux - - .abicalls - .text - .align 2 - .set nomips16 - .ent __do_global_dtors_aux - .type __do_global_dtors_aux, @function -__do_global_dtors_aux: - .frame $sp,32,$31 # vars= 0, regs= 1/0, args= 16, gp= 8 - .mask 0x80000000,-4 - .fmask 0x00000000,0 - .set noreorder - .cpload $25 - .set nomacro - addiu $sp,$sp,-32 - sw $31,28($sp) - .cprestore 16 - lw $2,%got(completed.1269)($28) - lbu $2,%lo(completed.1269)($2) - bne $2,$0,$L8 - nop - -$L4: - lw $2,%got(__cxa_finalize)($28) - beq $2,$0,$L6 - nop - - lw $2,%got(__dso_handle)($28) - lw $4,0($2) - lw $25,%call16(__cxa_finalize)($28) - .reloc 1f,R_MIPS_JALR,__cxa_finalize -1: jalr $25 - nop - - lw $28,16($sp) -$L6: - lw $2,%got(completed.1269)($28) - li $3,1 # 0x1 - sb $3,%lo(completed.1269)($2) -$L8: - lw $31,28($sp) - addiu $sp,$sp,32 - j $31 - nop - - .set macro - .set reorder - .end __do_global_dtors_aux - .size __do_global_dtors_aux, .-__do_global_dtors_aux - .local completed.1269 - .comm completed.1269,1,1 - .weak __cxa_finalize - -.include "__dso_handle.S" -.include "atexit.S" diff --git a/ndk/platforms/android-9/arch-mips/src/atexit.S b/ndk/platforms/android-9/arch-mips/src/crtbegin_so.c similarity index 81% rename from ndk/platforms/android-9/arch-mips/src/atexit.S rename to ndk/platforms/android-9/arch-mips/src/crtbegin_so.c index 7f0c82088..925dc8c1a 100644 --- a/ndk/platforms/android-9/arch-mips/src/atexit.S +++ b/ndk/platforms/android-9/arch-mips/src/crtbegin_so.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2013 The Android Open Source Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,19 +25,14 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - .text - .globl atexit - .hidden atexit - .type atexit, @function - .align 4 - .ent atexit -atexit: - .set noreorder - .cpload $t9 - .set reorder - la $t9, __cxa_atexit - move $a1, $0 - la $a2, __dso_handle - j $t9 - .size atexit, .-atexit - .end atexit + +extern void __cxa_finalize(void *); +extern void *__dso_handle; + +__attribute__((visibility("hidden"),destructor)) +void __on_dlclose() { + __cxa_finalize(&__dso_handle); +} + +#include "__dso_handle_so.h" +#include "atexit.h" diff --git a/ndk/platforms/android-9/arch-mips/src/crtbegin_static.S b/ndk/platforms/android-9/arch-mips/src/crtbegin_static.S deleted file mode 100644 index 58bab827f..000000000 --- a/ndk/platforms/android-9/arch-mips/src/crtbegin_static.S +++ /dev/null @@ -1,234 +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 - .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 -# - - .ent __start -__start: -_start: - bal 1f -1: - .set noreorder - .cpload $ra - .set reorder - - move $a0, $sp - move $a1, $0 - la $a2, main - la $a3, 1f - subu $sp, 32 - la $t9, __libc_init -# Use jalr intead of jr so stack unwinding past __libc_init can terminate at _start - jalr $t9 - move $t9, $0 - j $t9 - .end __start - -1: .long __PREINIT_ARRAY__ - .long __INIT_ARRAY__ - .long __FINI_ARRAY__ - .long __CTOR_LIST__ - .long __DTOR_LIST__ - - .section .preinit_array, "aw" - .type __PREINIT_ARRAY__, @object - .globl __PREINIT_ARRAY__ -__PREINIT_ARRAY__: - .long -1 - - .section .init_array, "aw" - .type __INIT_ARRAY__, @object - .globl __INIT_ARRAY__ -__INIT_ARRAY__: - .long -1 - .long frame_dummy - - .section .fini_array, "aw" - .type __FINI_ARRAY__, @object - .globl __FINI_ARRAY__ -__FINI_ARRAY__: - .long -1 - .long __do_global_dtors_aux - - .section .ctors, "aw" - .type __CTOR_LIST__, @object - .globl __CTOR_LIST__ -__CTOR_LIST__: - .long -1 - - .section .dtors, "aw" - .type __DTOR_LIST__, @object - .globl __DTOR_LIST__ -__DTOR_LIST__: - .long -1 - - .abicalls - .section .eh_frame,"a",@progbits - .align 2 - .type __EH_FRAME_BEGIN__, @object - .size __EH_FRAME_BEGIN__, 0 -__EH_FRAME_BEGIN__: - .text - .align 2 - .set nomips16 - .ent frame_dummy - .type frame_dummy, @function -frame_dummy: - .frame $sp,32,$31 # vars= 0, regs= 1/0, args= 16, gp= 8 - .mask 0x80000000,-4 - .fmask 0x00000000,0 - .set noreorder - .cpload $25 - .set nomacro - addiu $sp,$sp,-32 - sw $31,28($sp) - .cprestore 16 - lw $2,%got(__register_frame_info)($28) - beq $2,$0,$L1 - nop - - lw $2,%got(__EH_FRAME_BEGIN__)($28) - addiu $4,$2,%lo(__EH_FRAME_BEGIN__) - lw $2,%got(object.1265)($28) - addiu $5,$2,%lo(object.1265) - lw $2,%call16(__register_frame_info)($28) - move $25,$2 - .reloc 1f,R_MIPS_JALR,__register_frame_info -1: jalr $25 - nop - - lw $28,16($sp) -$L1: - lw $31,28($sp) - addiu $sp,$sp,32 - j $31 - nop - - .text - .set macro - .set reorder - .end frame_dummy - .size frame_dummy, .-frame_dummy - .align 2 - .set nomips16 - .ent __do_global_dtors_aux - .type __do_global_dtors_aux, @function -__do_global_dtors_aux: - .frame $sp,32,$31 # vars= 0, regs= 1/0, args= 16, gp= 8 - .mask 0x80000000,-4 - .fmask 0x00000000,0 - .set noreorder - .cpload $25 - .set nomacro - addiu $sp,$sp,-32 - sw $31,28($sp) - .cprestore 16 - lw $2,%got(completed.1269)($28) - lbu $2,%lo(completed.1269)($2) - bne $2,$0,$L8 - nop - -$L4: - lw $2,%got(__cxa_finalize)($28) - beq $2,$0,$L6 - nop - - lw $2,%got(__dso_handle)($28) - lw $2,0($2) - move $4,$2 - lw $2,%call16(__cxa_finalize)($28) - move $25,$2 - .reloc 1f,R_MIPS_JALR,__cxa_finalize -1: jalr $25 - nop - - lw $28,16($sp) -$L6: - lw $2,%got(__deregister_frame_info)($28) - beq $2,$0,$L7 - nop - - lw $2,%got(__EH_FRAME_BEGIN__)($28) - addiu $4,$2,%lo(__EH_FRAME_BEGIN__) - lw $2,%call16(__deregister_frame_info)($28) - move $25,$2 - .reloc 1f,R_MIPS_JALR,__deregister_frame_info -1: jalr $25 - nop - - lw $28,16($sp) -$L7: - lw $2,%got(completed.1269)($28) - li $3,1 # 0x1 - sb $3,%lo(completed.1269)($2) - b $L3 - nop - -$L8: - nop -$L3: - lw $31,28($sp) - addiu $sp,$sp,32 - j $31 - nop - - .set macro - .set reorder - .end __do_global_dtors_aux - .size __do_global_dtors_aux, .-__do_global_dtors_aux - .local completed.1269 - .comm completed.1269,1,1 - .local object.1265 - .comm object.1265,24,4 - .weak __deregister_frame_info - .weak __cxa_finalize - .weak __register_frame_info - -.include "__dso_handle.S" -.include "atexit.S"