diff options
| author | Kevin Buettner <kevinb@redhat.com> | 2004-03-11 17:04:40 +0000 |
|---|---|---|
| committer | Kevin Buettner <kevinb@redhat.com> | 2004-03-11 17:04:40 +0000 |
| commit | 1e15880cdccdc94c62eb9c20fa73cc397c4f824a (patch) | |
| tree | f81e44271d9291ce82da69f5ca6047e7f6516a70 /gdb/solib-svr4.c | |
| parent | 78ad2b95289cccc1c001c6a8ee13c16a06254435 (diff) | |
| download | gdb-1e15880cdccdc94c62eb9c20fa73cc397c4f824a.tar.gz | |
* solist.h (master_so_list): New function.
* solib.c (master_so_list): Likewise.
* solib-svr4.c (enable_break): Iterate over so_list entries
obtained from master list instead of entries obtained directly
via svr4_current_sos().
Diffstat (limited to 'gdb/solib-svr4.c')
| -rw-r--r-- | gdb/solib-svr4.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 4f4664cc017..020a55c2844 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -1004,7 +1004,7 @@ enable_break (void) char *buf; CORE_ADDR load_addr = 0; int load_addr_found = 0; - struct so_list *inferior_sos; + struct so_list *so; bfd *tmp_bfd = NULL; struct target_ops *tmp_bfd_target; int tmp_fd = -1; @@ -1047,23 +1047,19 @@ enable_break (void) target will also close the underlying bfd. */ tmp_bfd_target = target_bfd_reopen (tmp_bfd); - /* If the entry in _DYNAMIC for the dynamic linker has already - been filled in, we can read its base address from there. */ - inferior_sos = svr4_current_sos (); - if (inferior_sos) + /* On a running target, we can get the dynamic linker's base + address from the shared library table. */ + solib_add (NULL, 0, NULL, auto_solib_add); + so = master_so_list (); + while (so) { - /* Connected to a running target. Update our shared library table. */ - solib_add (NULL, 0, NULL, auto_solib_add); - } - while (inferior_sos) - { - if (strcmp (buf, inferior_sos->so_original_name) == 0) + if (strcmp (buf, so->so_original_name) == 0) { load_addr_found = 1; - load_addr = LM_ADDR (inferior_sos); + load_addr = LM_ADDR (so); break; } - inferior_sos = inferior_sos->next; + so = so->next; } /* Otherwise we find the dynamic linker's base address by examining |