summaryrefslogtreecommitdiffstats
path: root/libc/bionic
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-06-18 14:47:22 -0700
committerDavid 'Digit' Turner <digit@google.com>2010-06-18 16:07:10 -0700
commit6a9b888d7c4b246f6f66360789c72b754ff85021 (patch)
treed27e4487c13f200d4cfe193f950e25a01efa7743 /libc/bionic
parent6a09cfd9f916e3a60de707ff0806cdeb143d77a4 (diff)
downloadbionic-6a9b888d7c4b246f6f66360789c72b754ff85021.zip
bionic-6a9b888d7c4b246f6f66360789c72b754ff85021.tar.gz
bionic-6a9b888d7c4b246f6f66360789c72b754ff85021.tar.bz2
Allow static C++ destructors to be properly called on dlclose().
With this patch, _and_ an upcoming build/ patch, the destruction of static C++ objects contained in shared libraries will happen properly when dlclose() is called. Note that this change introduces crtbegin_so.S and crtend_so.S which are currently ignored by the build system. + move definition of __dso_handle to the right place (before that, all shared libraries used the __dso_handle global variable from the C library). Note that we keep a 'weak' __dso_handle in aeabi.c to avoid breaking the build until the next patch to build/core/combo/ appears. We will be able to remove that later. + move bionic/aeabi.c to arch-arm/bionic/ (its proper location) Change-Id: Ie771aa204e3acbdf02fd30ebd4150373a1398f39 NOTE: The NDK will need to be modified to enable this feature in the shared libraries that are generated through it.
Diffstat (limited to 'libc/bionic')
-rw-r--r--libc/bionic/eabi.c105
1 files changed, 0 insertions, 105 deletions
diff --git a/libc/bionic/eabi.c b/libc/bionic/eabi.c
deleted file mode 100644
index a5f6627..0000000
--- a/libc/bionic/eabi.c
+++ /dev/null
@@ -1,105 +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 <stddef.h>
-#include <string.h>
-
-extern int __cxa_atexit(void (*)(void*), void*, void* );
-
-void* __dso_handle = 0;
-
-/* The "C++ ABI for ARM" document states that static C++ constructors,
- * which are called from the .init_array, should manually call
- * __aeabi_atexit() to register static destructors explicitely.
- *
- * Note that 'dso_handle' is the address of a magic linker-generate
- * variable from the shared object that contains the constructor/destructor
- */
-
-/* Make this a weak symbol to avoid a multiple definition error when linking
- * with libstdc++-v3. */
-int __attribute__((weak))
-__aeabi_atexit (void *object, void (*destructor) (void *), void *dso_handle)
-{
- return __cxa_atexit(destructor, object, dso_handle);
-}
-
-
-void __aeabi_memcpy8(void *dest, const void *src, size_t n) {
- memcpy(dest, src, n);
-}
-
-void __aeabi_memcpy4(void *dest, const void *src, size_t n) {
- memcpy(dest, src, n);
-}
-
-void __aeabi_memcpy(void *dest, const void *src, size_t n) {
- memcpy(dest, src, n);
-}
-
-
-void __aeabi_memmove8(void *dest, const void *src, size_t n) {
- memmove(dest, src, n);
-}
-
-void __aeabi_memmove4(void *dest, const void *src, size_t n) {
- memmove(dest, src, n);
-}
-
-void __aeabi_memmove(void *dest, const void *src, size_t n) {
- memmove(dest, src, n);
-}
-
-/*
- * __aeabi_memset has the order of its second and third arguments reversed.
- * This allows __aeabi_memclr to tail-call __aeabi_memset
- */
-
-void __aeabi_memset8(void *dest, size_t n, int c) {
- memset(dest, c, n);
-}
-
-void __aeabi_memset4(void *dest, size_t n, int c) {
- memset(dest, c, n);
-}
-
-void __aeabi_memset(void *dest, size_t n, int c) {
- memset(dest, c, n);
-}
-
-
-void __aeabi_memclr8(void *dest, size_t n) {
- __aeabi_memset8(dest, n, 0);
-}
-
-void __aeabi_memclr4(void *dest, size_t n) {
- __aeabi_memset4(dest, n, 0);
-}
-
-void __aeabi_memclr(void *dest, size_t n) {
- __aeabi_memset(dest, n, 0);
-}