Clean up abort.
* A dlmalloc usage error shouldn't call abort(3) because we want to
cause a SIGSEGV by writing the address dlmalloc didn't like to an
address the kernel won't like, so that debuggerd will dump the
memory around the address that upset dlmalloc.
* Switch to the simpler FreeBSD/NetBSD style of registering stdio
cleanup. Hopefully this will let us simplify more of the stdio
implementation.
* Clear the stdio cleanup handler before we abort because of a dlmalloc
corruption error. This fixes the reported bug, where we'd hang inside
dlmalloc because the stdio cleanup reentered dlmalloc.
Bug: 9301265
Change-Id: Ief31b389455d6876e5a68f0f5429567d37277dbc
diff --git a/libc/Android.mk b/libc/Android.mk
index c98bf9e..49d93af 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -6,7 +6,6 @@
# =========================================================
libc_common_src_files := \
$(syscall_src) \
- unistd/abort.c \
unistd/alarm.c \
unistd/exec.c \
unistd/fnmatch.c \
@@ -192,6 +191,7 @@
netbsd/nameser/ns_samedomain.c \
libc_bionic_src_files := \
+ bionic/abort.cpp \
bionic/assert.cpp \
bionic/brk.cpp \
bionic/dirent.cpp \