commit ff7d94530db60cf4fe4a4c287ee8821ebdf6263a
author Jean-Baptiste Queru <jbq@google.com> Mon Oct 11 07:27:01 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 11 07:27:01 2010 -0700
tree d96451dc3f2673a4205740c50cb9c8578cd59ad0
parent d69ec35bef0d3aa11bfb55501951eed8c3042fda
parent f67e5211e045af1b12f646448a5a35f96ba5e8f1

am f67e5211: Merge "Hide the symbol of helper function __libc_android_abort"

Merge commit 'f67e5211e045af1b12f646448a5a35f96ba5e8f1' into gingerbread-plus-aosp

* commit 'f67e5211e045af1b12f646448a5a35f96ba5e8f1':
  Hide the symbol of helper function __libc_android_abort

libc/include/sys/cdefs_elf.h

diff --git a/libc/include/sys/cdefs_elf.h b/libc/include/sys/cdefs_elf.h
index e051b1d..1e57470 100644
--- a/libc/include/sys/cdefs_elf.h
+++ b/libc/include/sys/cdefs_elf.h
@@ -95,6 +95,10 @@
 	__asm__(".section _sec\n\t.asciz _str\n\t.previous")
 #endif
 
+/* GCC visibility helper macro */
+#define __LIBC_HIDDEN__							\
+	__attribute__ ((visibility ("hidden")))
+
 #define	__IDSTRING(_n,_s)		__SECTIONSTRING(.ident,_s)
 
 #define	__RCSID(_s)			__IDSTRING(rcsid,_s)

libc/unistd/abort.c

diff --git a/libc/unistd/abort.c b/libc/unistd/abort.c
index 3e3aab0..8b8659b 100644
--- a/libc/unistd/abort.c
+++ b/libc/unistd/abort.c
@@ -40,7 +40,7 @@
     __libc_android_log_print(ANDROID_LOG_DEBUG, "libc-abort", (format), ##__VA_ARGS__ )
 
 #ifdef __arm__
-void
+__LIBC_HIDDEN__ void
 __libc_android_abort(void)
 #else
 void