From 4cc98c360d8e9ab567e915e7b080b5d4113d5b3b Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 4 Apr 2022 15:08:15 -0700 Subject: [PATCH] Handle TLS variable lookups when using separate debug files. Commit df22c1e5d53c38f38bce6072bb46de240f9e0e2b handled the case that a separate debug file was passed as the objfile for a shared library to svr4_fetch_objfile_link_map. However, a separate debug file can also be passed for TLS variables in the main executable. In addition, frv_fetch_objfile_link_map also expects to be passed the original objfile rather than a separate debug file, so pull the code to resolve a separate debug file to the main objfile up into target_translate_tls_address. --- gdb/solib-svr4.c | 5 ----- gdb/target.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 2624ec286a0..ca98a812f36 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -1453,11 +1453,6 @@ svr4_fetch_objfile_link_map (struct objfile *objfile) if (objfile == current_program_space->symfile_object_file) return info->main_lm_addr; - /* If OBJFILE is a separate debug object file, look for the - original object file. */ - if (objfile->separate_debug_objfile_backlink != NULL) - objfile = objfile->separate_debug_objfile_backlink; - /* The other link map addresses may be found by examining the list of shared libraries. */ for (struct so_list *so : current_program_space->solibs ()) diff --git a/gdb/target.c b/gdb/target.c index 928f5583a30..f33bf345cfa 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1296,6 +1296,11 @@ target_translate_tls_address (struct objfile *objfile, CORE_ADDR offset) struct target_ops *target = current_inferior ()->top_target (); struct gdbarch *gdbarch = target_gdbarch (); + /* If OBJFILE is a separate debug object file, look for the + original object file. */ + if (objfile->separate_debug_objfile_backlink != NULL) + objfile = objfile->separate_debug_objfile_backlink; + if (gdbarch_fetch_tls_load_module_address_p (gdbarch)) { ptid_t ptid = inferior_ptid; -- 2.30.2