From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 18 Apr 2015 03:23:05 +0000 (-0400)
Subject: ensure debugger hook for dynamic linker does not point to a PLT slot
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=326e126faf91e2c18a8a656fbb0daab54b1818d6;p=android-x86%2Fexternal-musl-libc.git

ensure debugger hook for dynamic linker does not point to a PLT slot

this change is made in preparation to support linking without
-Bsymbolic-functions.
---

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 122fc49e..9f91a738 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -998,10 +998,12 @@ static void do_init_fini(struct dso *p)
 	if (need_locking) pthread_mutex_unlock(&init_fini_lock);
 }
 
-void _dl_debug_state(void)
+static void dl_debug_state(void)
 {
 }
 
+weak_alias(dl_debug_state, _dl_debug_state);
+
 void __reset_tls()
 {
 	pthread_t self = __pthread_self();
@@ -1369,7 +1371,7 @@ _Noreturn void __dls3(size_t *sp)
 	runtime = 1;
 
 	debug.ver = 1;
-	debug.bp = _dl_debug_state;
+	debug.bp = dl_debug_state;
 	debug.head = head;
 	debug.base = ldso.base;
 	debug.state = 0;