From 326e126faf91e2c18a8a656fbb0daab54b1818d6 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 17 Apr 2015 23:23:05 -0400 Subject: 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. --- src/ldso/dynlink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- cgit v1.2.1