summaryrefslogtreecommitdiffstats
path: root/libc/bionic/eabi.c
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:43:56 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:43:56 -0800
commit9f65adf2ba3bb15feb8b7a7b3eef788df3fd270e (patch)
treec06064fc9022ef63a40f83a91292103784f49780 /libc/bionic/eabi.c
parentd37527501c85edcb3a6a7c8a0b6297d52d434897 (diff)
downloadbionic-9f65adf2ba3bb15feb8b7a7b3eef788df3fd270e.zip
bionic-9f65adf2ba3bb15feb8b7a7b3eef788df3fd270e.tar.gz
bionic-9f65adf2ba3bb15feb8b7a7b3eef788df3fd270e.tar.bz2
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'libc/bionic/eabi.c')
-rw-r--r--libc/bionic/eabi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libc/bionic/eabi.c b/libc/bionic/eabi.c
index c491f05..f212d05 100644
--- a/libc/bionic/eabi.c
+++ b/libc/bionic/eabi.c
@@ -30,7 +30,10 @@
void* __dso_handle = 0;
-int __aeabi_atexit (void *object, void (*destructor) (void *), void *dso_handle)
+/* 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);
return 0;