diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/solib-svr4.c | 22 |
2 files changed, 15 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6bf38d824f9..bbe728e5a0b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2002-06-09 Mark Kettenis <kettenis@gnu.org> + * solib-svr4.c (init_fetch_link_map_offsets): Simply return + legacy_fetch_link_map_offsets. Adjust comment to reflect reality + after Andrew's 2002-06-08 gdbarch change. + +2002-06-09 Mark Kettenis <kettenis@gnu.org> + * i386-linux-nat.c (suppy_gregset): Don't supply I386_LINUX_ORIG_EAX_REGNUM if there isn't room for it in GDB's register cache. diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 2d71097c091..3f98a1eb433 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -1318,24 +1318,20 @@ set_solib_svr4_fetch_link_map_offsets (struct gdbarch *gdbarch, set_gdbarch_data (gdbarch, fetch_link_map_offsets_gdbarch_data, flmo); } -/* Initialize the architecture specific link_map_offsets fetcher. - This is called after <arch>_gdbarch_init() has set up its struct - gdbarch for the new architecture, so care must be taken to use the - value set by set_solib_svr4_fetch_link_map_offsets(), above. We - do, however, attempt to provide a reasonable alternative (for - native targets anyway) if the <arch>_gdbarch_init() fails to call +/* Initialize the architecture-specific link_map_offsets fetcher. + This is called after <arch>_gdbarch_init() has set up its `struct + gdbarch' for the new architecture, and is only called if the + link_map_offsets fetcher isn't already initialized (which is + usually done by calling set_solib_svr4_fetch_link_map_offsets() + above in <arch>_gdbarch_init()). Therefore we attempt to provide a + reasonable alternative (for native targets anyway) if the + <arch>_gdbarch_init() fails to call set_solib_svr4_fetch_link_map_offsets(). */ static void * init_fetch_link_map_offsets (struct gdbarch *gdbarch) { - struct link_map_offsets *(*flmo) = - gdbarch_data (gdbarch, fetch_link_map_offsets_gdbarch_data); - - if (flmo == NULL) - return legacy_fetch_link_map_offsets; - else - return flmo; + return legacy_fetch_link_map_offsets; } static struct target_so_ops svr4_so_ops; |