commit 793e6aedf2dfb6cc9bdf0cf9fd60dd87ec21f658
author Andrew Hsieh <andrewhsieh@google.com> Mon Jul 09 11:07:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 09 11:07:46 2012 -0700
tree 49ed031c801cbbb423baf37927e4cb83b8833608
parent 2ddf77b37731dff3a271c1312fc0bef2e7d41473
parent 67636eea20f7789e6689ee8cf6017e7d48735ca1

am 67636eea: am 40e7ed58: Unhide rtld_db_dlactivity()

* commit '67636eea20f7789e6689ee8cf6017e7d48735ca1':
  Unhide rtld_db_dlactivity()

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index e90ac0a..54fb22b 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -156,7 +156,7 @@
  * This function is an empty stub where GDB locates a breakpoint to get notified
  * about linker activity.
  */
-extern void __attribute__((noinline)) rtld_db_dlactivity(void);
+extern void __attribute__((noinline)) __attribute__((visibility("default"))) rtld_db_dlactivity(void);
 
 static struct r_debug _r_debug = {1, NULL, &rtld_db_dlactivity,
                                   RT_CONSISTENT, 0};

linker/rt.c

diff --git a/linker/rt.c b/linker/rt.c
index 30d5a48..afbd651 100644
--- a/linker/rt.c
+++ b/linker/rt.c
@@ -28,9 +28,9 @@
 
 /*
  * This function is an empty stub where GDB locates a breakpoint to get notified
- * about linker activity.
+ * about linker activity.  It canʼt be inlined away, canʼt be hidden.
  */
-void __attribute__((noinline)) rtld_db_dlactivity(void)
+void __attribute__((noinline)) __attribute__((visibility("default"))) rtld_db_dlactivity(void)
 {
 }