summaryrefslogtreecommitdiffstats
path: root/linker
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-07-09 11:07:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-09 11:07:46 -0700
commit793e6aedf2dfb6cc9bdf0cf9fd60dd87ec21f658 (patch)
tree49ed031c801cbbb423baf37927e4cb83b8833608 /linker
parent2ddf77b37731dff3a271c1312fc0bef2e7d41473 (diff)
parent67636eea20f7789e6689ee8cf6017e7d48735ca1 (diff)
downloadbionic-793e6aedf2dfb6cc9bdf0cf9fd60dd87ec21f658.zip
bionic-793e6aedf2dfb6cc9bdf0cf9fd60dd87ec21f658.tar.gz
bionic-793e6aedf2dfb6cc9bdf0cf9fd60dd87ec21f658.tar.bz2
am 67636eea: am 40e7ed58: Unhide rtld_db_dlactivity()
* commit '67636eea20f7789e6689ee8cf6017e7d48735ca1': Unhide rtld_db_dlactivity()
Diffstat (limited to 'linker')
-rw-r--r--linker/linker.c2
-rw-r--r--linker/rt.c4
2 files changed, 3 insertions, 3 deletions
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 @@ const char *linker_get_error(void)
* 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};
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)
{
}