summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-07-09 11:05:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-09 11:05:16 -0700
commit67636eea20f7789e6689ee8cf6017e7d48735ca1 (patch)
treed3e4c139b5285fa5bc43c013e8ad7dd5f6d4edb9
parent5af97ca8514d9fb4175bff3a79abf26889b94530 (diff)
parent40e7ed58d73eae59d0cf2fed61284d16692e307b (diff)
downloadbionic-67636eea20f7789e6689ee8cf6017e7d48735ca1.zip
bionic-67636eea20f7789e6689ee8cf6017e7d48735ca1.tar.gz
bionic-67636eea20f7789e6689ee8cf6017e7d48735ca1.tar.bz2
am 40e7ed58: Unhide rtld_db_dlactivity()
* commit '40e7ed58d73eae59d0cf2fed61284d16692e307b': Unhide rtld_db_dlactivity()
-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 eb9cc3e..df4a8b1 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -159,7 +159,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)
{
}