diff --git a/ndk/crt/mips/atexit.h b/ndk/crt/mips/atexit.h deleted file mode 100644 index 3ded9bfe2..000000000 --- a/ndk/crt/mips/atexit.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 - -extern void* __dso_handle; - -extern int __cxa_atexit(void (*)(void*), void*, void*); - -__attribute__ ((visibility ("hidden"))) -void __atexit_handler_wrapper(void* func) { - if (func != NULL) { - (*(void (*)(void))func)(); - } -} - -__attribute__ ((visibility ("hidden"))) -int atexit(void (*func)(void)) { - return (__cxa_atexit(&__atexit_handler_wrapper, func, &__dso_handle)); -} diff --git a/ndk/crt/mips/crtbegin.c b/ndk/crt/mips/crtbegin.c deleted file mode 100644 index 618e020c3..000000000 --- a/ndk/crt/mips/crtbegin.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - * 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/crt/mips/crtbegin_so.c b/ndk/crt/mips/crtbegin_so.c deleted file mode 100644 index 925dc8c1a..000000000 --- a/ndk/crt/mips/crtbegin_so.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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. - */ - -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/crt/mips/crtend_android.S b/ndk/crt/mips/crtend_android.S deleted file mode 100644 index 8a3cc6c85..000000000 --- a/ndk/crt/mips/crtend_android.S +++ /dev/null @@ -1,53 +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 .preinit_array, "aw" - .long 0 - - .section .init_array, "aw" - .long 0 - - .section .fini_array, "aw" - .long 0 - - .section .ctors, "aw" - .type __CTOR_END__, @object -__CTOR_END__: - .long 0 - - .section .dtors, "aw" - .type __DTOR_END__, @object -__DTOR_END__: - .long 0 - - .section .eh_frame,"a",@progbits - .align 4 - .type __FRAME_END__, @object - .size __FRAME_END__, 4 -__FRAME_END__: - .zero 4 diff --git a/ndk/crt/mips/crtend_so.S b/ndk/crt/mips/crtend_so.S deleted file mode 100644 index f09c42708..000000000 --- a/ndk/crt/mips/crtend_so.S +++ /dev/null @@ -1,5 +0,0 @@ - .section .init_array, "aw" - .long 0 - - .section .fini_array, "aw" - .long 0 diff --git a/ndk/crt/mips64/asm_multiarch.h b/ndk/crt/mips64/asm_multiarch.h deleted file mode 100644 index 91cb8af4b..000000000 --- a/ndk/crt/mips64/asm_multiarch.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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. - */ - -#ifdef __LP64__ -# define ASM_PTR_SIZE(x) .quad x -# define ASM_ALIGN_TO_PTR_SIZE .balign 8 -#else -# define ASM_PTR_SIZE(x) .long x -# define ASM_ALIGN_TO_PTR_SIZE .balign 4 -#endif - diff --git a/ndk/crt/mips64/atexit.h b/ndk/crt/mips64/atexit.h deleted file mode 100644 index 3ded9bfe2..000000000 --- a/ndk/crt/mips64/atexit.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 - -extern void* __dso_handle; - -extern int __cxa_atexit(void (*)(void*), void*, void*); - -__attribute__ ((visibility ("hidden"))) -void __atexit_handler_wrapper(void* func) { - if (func != NULL) { - (*(void (*)(void))func)(); - } -} - -__attribute__ ((visibility ("hidden"))) -int atexit(void (*func)(void)) { - return (__cxa_atexit(&__atexit_handler_wrapper, func, &__dso_handle)); -} diff --git a/ndk/crt/mips64/crtbegin.c b/ndk/crt/mips64/crtbegin.c deleted file mode 100644 index 1fe81770c..000000000 --- a/ndk/crt/mips64/crtbegin.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * 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 "../../bionic/libc_init_common.h" -#include -#include - -__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 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__; - - __libc_init(raw_args, NULL, &main, &array); -} - -#if defined(__LP64__) - -/* - * This function prepares the return address with a branch-and-link - * instruction (bal) and then uses a .cpsetup to compute the Global - * Offset Table (GOT) pointer ($gp). The $gp is then used to load - * the address of _do_mips_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,$0 \n" -" .mask 0x80000000,-8 \n" -" \n" -" move $a0, $sp \n" -" daddiu $sp, $sp, -32 \n" -" \n" -" .set noreorder \n" -" bal 1f \n" -" nop \n" -"1: \n" -" .cpsetup $ra,16,1b \n" -" .set reorder \n" -" \n" -" sd $0, 24($sp) \n" -" jal do_mips_start \n" -" \n" -"2: b 2b \n" -" .end __start \n" -" \n" -" .set pop \n" -); - -#else - -/* - * 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" -); - -#endif - -#include "../../arch-common/bionic/__dso_handle.h" -#include "atexit.h" diff --git a/ndk/crt/mips64/crtbegin_so.c b/ndk/crt/mips64/crtbegin_so.c deleted file mode 100644 index 925dc8c1a..000000000 --- a/ndk/crt/mips64/crtbegin_so.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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. - */ - -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/crt/mips64/crtend_android.S b/ndk/crt/mips64/crtend_android.S deleted file mode 100644 index c7bab47f3..000000000 --- a/ndk/crt/mips64/crtend_android.S +++ /dev/null @@ -1,58 +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. - */ - -#include "asm_multiarch.h" - - .section .preinit_array, "aw" - ASM_ALIGN_TO_PTR_SIZE - ASM_PTR_SIZE(0) - - .section .init_array, "aw" - ASM_ALIGN_TO_PTR_SIZE - ASM_PTR_SIZE(0) - - .section .fini_array, "aw" - ASM_ALIGN_TO_PTR_SIZE - ASM_PTR_SIZE(0) - - .section .ctors, "aw" - .type __CTOR_END__, @object -__CTOR_END__: - ASM_PTR_SIZE(0) - - .section .dtors, "aw" - .type __DTOR_END__, @object -__DTOR_END__: - ASM_PTR_SIZE(0) - - .section .eh_frame,"a",@progbits - .align 4 - .type __FRAME_END__, @object - .size __FRAME_END__, 4 -__FRAME_END__: - .zero 4 diff --git a/ndk/crt/mips64/crtend_so.S b/ndk/crt/mips64/crtend_so.S deleted file mode 100644 index 490af3ccc..000000000 --- a/ndk/crt/mips64/crtend_so.S +++ /dev/null @@ -1,9 +0,0 @@ -#include "asm_multiarch.h" - - .section .init_array, "aw" - ASM_ALIGN_TO_PTR_SIZE - ASM_PTR_SIZE(0) - - .section .fini_array, "aw" - ASM_ALIGN_TO_PTR_SIZE - ASM_PTR_SIZE(0) diff --git a/ndk/platforms/android-14/arch-arm/lib/libdl.a b/ndk/platforms/android-14/arch-arm/lib/libdl.a new file mode 100644 index 000000000..2fff63957 Binary files /dev/null and b/ndk/platforms/android-14/arch-arm/lib/libdl.a differ diff --git a/ndk/platforms/android-14/arch-mips/lib/libc.a b/ndk/platforms/android-14/arch-mips/lib/libc.a deleted file mode 100644 index 6a85a6de2..000000000 Binary files a/ndk/platforms/android-14/arch-mips/lib/libc.a and /dev/null differ diff --git a/ndk/platforms/android-14/arch-mips/lib/libm.a b/ndk/platforms/android-14/arch-mips/lib/libm.a deleted file mode 100644 index 8faed9158..000000000 Binary files a/ndk/platforms/android-14/arch-mips/lib/libm.a and /dev/null differ diff --git a/ndk/platforms/android-14/arch-mips/lib/libstdc++.a b/ndk/platforms/android-14/arch-mips/lib/libstdc++.a deleted file mode 100644 index 9bdce4f03..000000000 Binary files a/ndk/platforms/android-14/arch-mips/lib/libstdc++.a and /dev/null differ diff --git a/ndk/platforms/android-14/arch-x86/lib/libdl.a b/ndk/platforms/android-14/arch-x86/lib/libdl.a new file mode 100644 index 000000000..97e733ec9 Binary files /dev/null and b/ndk/platforms/android-14/arch-x86/lib/libdl.a differ diff --git a/ndk/platforms/android-21/arch-arm/lib/libdl.a b/ndk/platforms/android-21/arch-arm/lib/libdl.a new file mode 100644 index 000000000..2fff63957 Binary files /dev/null and b/ndk/platforms/android-21/arch-arm/lib/libdl.a differ diff --git a/ndk/platforms/android-21/arch-arm64/lib/libdl.a b/ndk/platforms/android-21/arch-arm64/lib/libdl.a new file mode 100644 index 000000000..c88c6d680 Binary files /dev/null and b/ndk/platforms/android-21/arch-arm64/lib/libdl.a differ diff --git a/ndk/platforms/android-21/arch-mips/lib/libc.a b/ndk/platforms/android-21/arch-mips/lib/libc.a deleted file mode 100644 index ac6dcbf58..000000000 Binary files a/ndk/platforms/android-21/arch-mips/lib/libc.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips/lib/libm.a b/ndk/platforms/android-21/arch-mips/lib/libm.a deleted file mode 100644 index 76a4e2ea7..000000000 Binary files a/ndk/platforms/android-21/arch-mips/lib/libm.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips/lib/libstdc++.a b/ndk/platforms/android-21/arch-mips/lib/libstdc++.a deleted file mode 100644 index 1896a36df..000000000 Binary files a/ndk/platforms/android-21/arch-mips/lib/libstdc++.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips/lib/libz.a b/ndk/platforms/android-21/arch-mips/lib/libz.a deleted file mode 100644 index f843e4035..000000000 Binary files a/ndk/platforms/android-21/arch-mips/lib/libz.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib/libc.a b/ndk/platforms/android-21/arch-mips64/lib/libc.a deleted file mode 120000 index d95513dbb..000000000 --- a/ndk/platforms/android-21/arch-mips64/lib/libc.a +++ /dev/null @@ -1 +0,0 @@ -../../arch-mips/lib/libc.a \ No newline at end of file diff --git a/ndk/platforms/android-21/arch-mips64/lib/libm.a b/ndk/platforms/android-21/arch-mips64/lib/libm.a deleted file mode 120000 index 118d2e325..000000000 --- a/ndk/platforms/android-21/arch-mips64/lib/libm.a +++ /dev/null @@ -1 +0,0 @@ -../../arch-mips/lib/libm.a \ No newline at end of file diff --git a/ndk/platforms/android-21/arch-mips64/lib/libstdc++.a b/ndk/platforms/android-21/arch-mips64/lib/libstdc++.a deleted file mode 120000 index 27e902faf..000000000 --- a/ndk/platforms/android-21/arch-mips64/lib/libstdc++.a +++ /dev/null @@ -1 +0,0 @@ -../../arch-mips/lib/libstdc++.a \ No newline at end of file diff --git a/ndk/platforms/android-21/arch-mips64/lib/libz.a b/ndk/platforms/android-21/arch-mips64/lib/libz.a deleted file mode 120000 index 463370da7..000000000 --- a/ndk/platforms/android-21/arch-mips64/lib/libz.a +++ /dev/null @@ -1 +0,0 @@ -../../arch-mips/lib/libz.a \ No newline at end of file diff --git a/ndk/platforms/android-21/arch-mips64/lib64/libc.a b/ndk/platforms/android-21/arch-mips64/lib64/libc.a deleted file mode 100644 index d49e78615..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64/libc.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib64/libm.a b/ndk/platforms/android-21/arch-mips64/lib64/libm.a deleted file mode 100644 index 54ae7d2ca..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64/libm.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib64/libstdc++.a b/ndk/platforms/android-21/arch-mips64/lib64/libstdc++.a deleted file mode 100644 index a64f2cf02..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64/libstdc++.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib64/libz.a b/ndk/platforms/android-21/arch-mips64/lib64/libz.a deleted file mode 100644 index ba98a5fac..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64/libz.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib64r2/libc.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libc.a deleted file mode 100644 index 6b02bf2af..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64r2/libc.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib64r2/libm.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libm.a deleted file mode 100644 index f7f83d92b..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64r2/libm.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib64r2/libstdc++.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libstdc++.a deleted file mode 100644 index 9c4e35d47..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64r2/libstdc++.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/lib64r2/libz.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libz.a deleted file mode 100644 index 842b5a55f..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/lib64r2/libz.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr2/libc.a b/ndk/platforms/android-21/arch-mips64/libr2/libc.a deleted file mode 100644 index 9d32b5f23..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr2/libc.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr2/libm.a b/ndk/platforms/android-21/arch-mips64/libr2/libm.a deleted file mode 100644 index 50e741ac3..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr2/libm.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr2/libstdc++.a b/ndk/platforms/android-21/arch-mips64/libr2/libstdc++.a deleted file mode 100644 index 952bbd174..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr2/libstdc++.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr2/libz.a b/ndk/platforms/android-21/arch-mips64/libr2/libz.a deleted file mode 100644 index 0ebd2a1a1..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr2/libz.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr6/libc.a b/ndk/platforms/android-21/arch-mips64/libr6/libc.a deleted file mode 100644 index a4df17a1a..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr6/libc.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr6/libm.a b/ndk/platforms/android-21/arch-mips64/libr6/libm.a deleted file mode 100644 index c9681bd68..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr6/libm.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr6/libstdc++.a b/ndk/platforms/android-21/arch-mips64/libr6/libstdc++.a deleted file mode 100644 index a9829c8c7..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr6/libstdc++.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-mips64/libr6/libz.a b/ndk/platforms/android-21/arch-mips64/libr6/libz.a deleted file mode 100644 index 39549364a..000000000 Binary files a/ndk/platforms/android-21/arch-mips64/libr6/libz.a and /dev/null differ diff --git a/ndk/platforms/android-21/arch-x86/lib/libdl.a b/ndk/platforms/android-21/arch-x86/lib/libdl.a new file mode 100644 index 000000000..97e733ec9 Binary files /dev/null and b/ndk/platforms/android-21/arch-x86/lib/libdl.a differ diff --git a/ndk/platforms/android-21/arch-x86_64/lib64/libdl.a b/ndk/platforms/android-21/arch-x86_64/lib64/libdl.a new file mode 100644 index 000000000..5150b6061 Binary files /dev/null and b/ndk/platforms/android-21/arch-x86_64/lib64/libdl.a differ