about summary refs log tree commit diff
path: root/nptl_db/structs.def
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-21 11:50:43 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-21 11:50:43 +0200
commita64afc225240b2b27129ccfb0516d7c958b98040 (patch)
tree02bdfc42d7b25fd2f537e6aad77be75f33af44ba /nptl_db/structs.def
parentaaa23c35071537e2dcf5807e956802ed215210aa (diff)
downloadglibc-a64afc225240b2b27129ccfb0516d7c958b98040.tar.gz
glibc-a64afc225240b2b27129ccfb0516d7c958b98040.tar.xz
glibc-a64afc225240b2b27129ccfb0516d7c958b98040.zip
nptl_db: Support different libpthread/ld.so load orders (bug 27744)
libthread_db is loaded once GDB encounters libpthread, and at this
point, ld.so may not have been processed by GDB yet. As a result,
_rtld_global cannot be accessed by regular means from libthread_db.
To make this work until GDB can be fixed, acess _rtld_global through
a pointer stored in libpthread.

The new test does not reproduce bug 27744 with
--disable-hardcoded-path-in-tests, but is still a valid smoke test.
With --enable-hardcoded-path-in-tests, it is necessary to avoid
add-symbol-file because this can tickle a GDB bug.

Fixes commit 1daccf403b1bd86370eb94edca794dc106d02039 ("nptl: Move
stack list variables into _rtld_global").

Tested-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'nptl_db/structs.def')
-rw-r--r--nptl_db/structs.def3
1 files changed, 1 insertions, 2 deletions
diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index 999a9fc35a..8a613dd2f5 100644
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -100,8 +100,7 @@ DB_STRUCT_FIELD (pthread, dtvp)
 #endif
 
 #if !(IS_IN (libpthread) && !defined SHARED)
-DB_STRUCT (rtld_global)
-DB_RTLD_VARIABLE (_rtld_global)
+DB_VARIABLE (__nptl_rtld_global)
 #endif
 DB_RTLD_GLOBAL_FIELD (dl_tls_dtv_slotinfo_list)
 DB_RTLD_GLOBAL_FIELD (dl_stack_user)