From 3e16f84fcad103c97a2df4a58948835277043569 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Thu, 14 May 2009 14:25:26 +0200
Subject: [PATCH] Fix __aeabi_atexit to call __cxa_atexit properly. This
 function is defined by the C++ ABI for ARM document.

---
 libc/bionic/eabi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libc/bionic/eabi.c b/libc/bionic/eabi.c
index f212d0556..21d853790 100644
--- a/libc/bionic/eabi.c
+++ b/libc/bionic/eabi.c
@@ -28,6 +28,8 @@
 #include <stddef.h>
 #include <string.h>
 
+extern int  __cxa_atexit(void (*)(void*), void*, void* );
+
 void* __dso_handle = 0;
 
 /* Make this a weak symbol to avoid a multiple definition error when linking
@@ -35,8 +37,7 @@ void* __dso_handle = 0;
 int __attribute__((weak))
 __aeabi_atexit (void *object, void (*destructor) (void *), void *dso_handle)
 {
-    //return __cxa_atexit(destructor, object, dso_handle);
-    return 0;
+    return __cxa_atexit(destructor, object, dso_handle);
 }