diff options
| author | Kevin Buettner <kevinb@redhat.com> | 2005-03-31 19:58:26 +0000 |
|---|---|---|
| committer | Kevin Buettner <kevinb@redhat.com> | 2005-03-31 19:58:26 +0000 |
| commit | b27569303241f8fde83dc9f8ea6ba6193e32a419 (patch) | |
| tree | 184d54bcc4b4cd2bba010f82e95fb097ae6621bc /gdb/dwarf2loc.c | |
| parent | 0e867e795772266c7c4f360f0e0ef4c9f9c2c93a (diff) | |
| download | gdb-b27569303241f8fde83dc9f8ea6ba6193e32a419.zip gdb-b27569303241f8fde83dc9f8ea6ba6193e32a419.tar.gz gdb-b27569303241f8fde83dc9f8ea6ba6193e32a419.tar.bz2 | |
* gdbarch.sh (fetch_tls_load_module_address): New architecture method.
* gdbarch.c, gdbarch.h: Regenerate.
* dwarf2loc.c (dwarf_expr_tls_address): Fetch TLS load module
address and pass this address, instead of the objfile address, to
target_get_thread_local_address().
* linux-thread-db.c (thread_db_get_thread_local_address): Change
second parameter from type ``struct objfile *'' to CORE_ADDR. Do
not call svr4_fetch_objfile_link_map() to fetch the load module
address.
* target.h (struct target_ops): Change second parameter of
``to_get_thread_local_address'' from ``struct objfile *'' to
``CORE_ADDR''.
* alpha-linux-tdep.c (solib-svr4.h): Include.
(alpha_linux_init_abi): Register TLS load module fetcher.
* amd64-linux-tdep.c (amd64_linux_init_abi): Likewise.
* hppa-linux-tdep.c (hppa_linux_init_abi): Likewise.
* i386-linux-tdep.c (i386_linux_init_abi): Likewise.
* ia64-linux-tdep.c (solib-svr4.h): Include.
(ia64_linux_init_abi): Register TLS load module fetcher.
* m32r-linux-tdep.c (m32r_linux_init_abi): Likewise.
* m68klinux-tdep.c (m68k_linux_init_abi): Likewise.
* mips-linux-tdep.c (mips_linux_init_abi): Likewise.
* s390-tdep.c (s390_gdbarch_init): Likewise.
* sparc-linux-tdep.c (sparc32_linux_init_abi): Likewise.
* sparc64-linux-tdep.c (solib-svr4.h): Include.
(sparc64_linux_init_abi): Register TLS load module fetcher.
* Makefile.in (alpha-linux-tdep.o, ia64-linux-tdep.o)
(sparc-linux-tdep.o): Update dependencies.
Diffstat (limited to 'gdb/dwarf2loc.c')
| -rw-r--r-- | gdb/dwarf2loc.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index 20bb65c..347b30d 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -188,7 +188,8 @@ dwarf_expr_tls_address (void *baton, CORE_ADDR offset) struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton; volatile CORE_ADDR addr = 0; - if (target_get_thread_local_address_p ()) + if (target_get_thread_local_address_p () + && gdbarch_fetch_tls_load_module_address_p (current_gdbarch)) { ptid_t ptid = inferior_ptid; struct objfile *objfile = debaton->objfile; @@ -196,7 +197,21 @@ dwarf_expr_tls_address (void *baton, CORE_ADDR offset) TRY_CATCH (ex, RETURN_MASK_ALL) { - addr = target_get_thread_local_address (ptid, objfile, offset); + CORE_ADDR lm_addr; + + /* Fetch the load module address for this objfile. */ + lm_addr = gdbarch_fetch_tls_load_module_address (current_gdbarch, + objfile); + /* If it's 0, throw the appropriate exception. */ + if (lm_addr == 0) + { + struct exception e + = { RETURN_ERROR, TLS_LOAD_MODULE_NOT_FOUND_ERROR, 0 }; + + throw_exception (e); + } + + addr = target_get_thread_local_address (ptid, lm_addr, offset); } /* If an error occurred, print TLS related messages here. Otherwise, throw the error to some higher catcher. */ |