diff options
| author | Bruce Beare <bruce.j.beare@intel.com> | 2011-06-20 10:29:50 -0700 |
|---|---|---|
| committer | Bruce Beare <bruce.j.beare@intel.com> | 2011-06-20 14:44:44 -0700 |
| commit | 39640842823ba4cd42bd11514c0da39aa939519f (patch) | |
| tree | c2cddf3319145716533bc9d12ad1d6bb5c047f59 /libc/private | |
| parent | 4d9b75a9b08c19cef81b22f889edba61257fb356 (diff) | |
| download | bionic-39640842823ba4cd42bd11514c0da39aa939519f.zip bionic-39640842823ba4cd42bd11514c0da39aa939519f.tar.gz bionic-39640842823ba4cd42bd11514c0da39aa939519f.tar.bz2 | |
Enable functional DSO object destruction
Unfortunately, legacy .so files for ARM don't have a correct crtbegin file.
Consequently, we have to grandfather the old __dso_handle behaviour.
Add some ifdefs for ARM to allow it to use the old code until we can work
out a transition.
Change-Id: I6a28f368267d792c94e1d985d8344023bc632f6f
Author: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Diffstat (limited to 'libc/private')
| -rw-r--r-- | libc/private/__dso_handle.S | 4 | ||||
| -rw-r--r-- | libc/private/__dso_handle_so.S | 38 |
2 files changed, 42 insertions, 0 deletions
diff --git a/libc/private/__dso_handle.S b/libc/private/__dso_handle.S index a6395dd6..3e80128 100644 --- a/libc/private/__dso_handle.S +++ b/libc/private/__dso_handle.S @@ -32,7 +32,11 @@ # .section .bss .align 4 + +#ifndef CRT_LEGACY_WORKAROUND .hidden __dso_handle +#endif + .globl __dso_handle __dso_handle: .long 0 diff --git a/libc/private/__dso_handle_so.S b/libc/private/__dso_handle_so.S new file mode 100644 index 0000000..77a5d7f --- /dev/null +++ b/libc/private/__dso_handle_so.S @@ -0,0 +1,38 @@ +/* + * 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 +# + .data + .align 4 + .hidden __dso_handle + .globl __dso_handle +__dso_handle: + .long __dso_handle |