diff options
author | David 'Digit' Turner <digit@google.com> | 2010-06-18 14:47:22 -0700 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2010-06-18 16:07:10 -0700 |
commit | 6a9b888d7c4b246f6f66360789c72b754ff85021 (patch) | |
tree | d27e4487c13f200d4cfe193f950e25a01efa7743 /libc/private | |
parent | 6a09cfd9f916e3a60de707ff0806cdeb143d77a4 (diff) | |
download | bionic-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/private')
-rw-r--r-- | libc/private/__dso_handle.S | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/libc/private/__dso_handle.S b/libc/private/__dso_handle.S new file mode 100644 index 0000000..fcebab6 --- /dev/null +++ b/libc/private/__dso_handle.S @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2010 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. + */ + +# 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 +# + .section .bss + .align 4 + .globl __dso_handle +__dso_handle: + .long 0 |