* solib-pa64.c (read_dld_descriptor): Return zero if load map is not

setup.
This commit is contained in:
Dave Anglin 2008-08-06 20:17:21 +00:00
parent f73a15e424
commit 6536cc32e2
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2008-08-06 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* solib-pa64.c (read_dld_descriptor): Return zero if load map is not
setup.
2008-08-06 Mark Kettenis <kettenis@gnu.org> 2008-08-06 Mark Kettenis <kettenis@gnu.org>
* i386obsd-nat.c (i386obsd_supply_pcb): Adjust for changes in * i386obsd-nat.c (i386obsd_supply_pcb): Adjust for changes in

View file

@ -125,8 +125,8 @@ pa64_target_read_memory (void *buffer, CORE_ADDR ptr, size_t bufsiz, int ident)
This must happen after dld starts running, so we can't do it in This must happen after dld starts running, so we can't do it in
read_dynamic_info. Record the fact that we have loaded the read_dynamic_info. Record the fact that we have loaded the
descriptor. If the library is archive bound, then return zero, else descriptor. If the library is archive bound or the load map
return nonzero. */ hasn't been setup, then return zero; else return nonzero. */
static int static int
read_dld_descriptor (void) read_dld_descriptor (void)
@ -161,6 +161,9 @@ read_dld_descriptor (void)
error (_("Error while reading in load map pointer.")); error (_("Error while reading in load map pointer."));
} }
if (!dld_cache.load_map)
return 0;
/* Read in the dld load module descriptor */ /* Read in the dld load module descriptor */
if (dlgetmodinfo (-1, if (dlgetmodinfo (-1,
&dld_cache.dld_desc, &dld_cache.dld_desc,