From 7d400e776320a9bf9575c4713dc429e7c8bc4364 Mon Sep 17 00:00:00 2001 From: Jason Thorpe Date: Mon, 2 Sep 2002 18:09:07 +0000 Subject: [PATCH] * Makefile.in (i386nbsd-tdep.o): Add $(solib_svr4_h) to dependency list. * i386nbsd-tdep.c (i386nbsdelf_init_abi): Set solib_svr4_fetch_link_map_offsets to nbsd_ilp32_solib_svr4_fetch_link_map_offsets. * config/i386/nbsd.mt (TDEPFILES): Add solib.o and solib-svr4.o. * config/i386/nbsdaout.mh (NATDEPFILES): Remove solib.o. * config/i386/nbsdelf.mh (NATDEPFILES): Remove solib.o, solib-svr4.o, and solib-legacy.o. * config/i386/tm-nbsd.h: Include solib.h. --- gdb/ChangeLog | 13 +++++++++++++ gdb/Makefile.in | 2 +- gdb/config/i386/nbsd.mt | 2 +- gdb/config/i386/nbsdaout.mh | 3 +-- gdb/config/i386/nbsdelf.mh | 3 +-- gdb/config/i386/tm-nbsd.h | 1 + gdb/i386nbsd-tdep.c | 4 ++++ 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8a78b1d6727..308ce31fcfc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2002-09-02 Jason Thorpe + + * Makefile.in (i386nbsd-tdep.o): Add $(solib_svr4_h) to + dependency list. + * i386nbsd-tdep.c (i386nbsdelf_init_abi): Set + solib_svr4_fetch_link_map_offsets to + nbsd_ilp32_solib_svr4_fetch_link_map_offsets. + * config/i386/nbsd.mt (TDEPFILES): Add solib.o and solib-svr4.o. + * config/i386/nbsdaout.mh (NATDEPFILES): Remove solib.o. + * config/i386/nbsdelf.mh (NATDEPFILES): Remove solib.o, + solib-svr4.o, and solib-legacy.o. + * config/i386/tm-nbsd.h: Include solib.h. + 2002-09-02 Jason Thorpe * configure.tgt (i[3456]86-*-netbsdelf*): Merge with... diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 2ce4805db5e..45739e3ab2c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1756,7 +1756,7 @@ i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \ # OBSOLETE i386mach-nat.o: i386mach-nat.c i386nbsd-tdep.o: i386nbsd-tdep.c $(defs_h) $(gdbtypes_h) $(gdbcore_h) \ $(regcache_h) $(arch_utils_h) $(i386_tdep_h) $(i387_tdep_h) \ - $(nbsd_tdep_h) + $(nbsd_tdep_h) $(solib_svr4_h) i386obsd-nat.o: i386obsd-nat.c $(defs_h) i386v-nat.o: i386v-nat.c $(defs_h) $(frame_h) $(inferior_h) $(language_h) \ $(gdbcore_h) $(gdb_stat_h) $(floatformat_h) $(target_h) diff --git a/gdb/config/i386/nbsd.mt b/gdb/config/i386/nbsd.mt index a1035cfaa19..f7f8cd6e70c 100644 --- a/gdb/config/i386/nbsd.mt +++ b/gdb/config/i386/nbsd.mt @@ -1,4 +1,4 @@ # Target: Intel 386 running NetBSD TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o corelow.o \ - nbsd-tdep.o + nbsd-tdep.o solib.o solib-svr4.o TM_FILE= tm-nbsd.h diff --git a/gdb/config/i386/nbsdaout.mh b/gdb/config/i386/nbsdaout.mh index e52f38a5b21..226c56cc445 100644 --- a/gdb/config/i386/nbsdaout.mh +++ b/gdb/config/i386/nbsdaout.mh @@ -1,6 +1,5 @@ # Host: Intel 386 running NetBSD -NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o \ - solib.o solib-sunos.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o solib-sunos.o XM_FILE= xm-nbsd.h NAT_FILE= nm-nbsdaout.h diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh index 0d1c4d1badc..7c27b02f3ac 100644 --- a/gdb/config/i386/nbsdelf.mh +++ b/gdb/config/i386/nbsdelf.mh @@ -1,5 +1,4 @@ # Host: Intel 386 running NetBSD -NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o \ - solib.o solib-svr4.o solib-legacy.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o XM_FILE= xm-nbsd.h NAT_FILE= nm-nbsd.h diff --git a/gdb/config/i386/tm-nbsd.h b/gdb/config/i386/tm-nbsd.h index d7c79d7ba1d..8e589281325 100644 --- a/gdb/config/i386/tm-nbsd.h +++ b/gdb/config/i386/tm-nbsd.h @@ -22,5 +22,6 @@ #define TM_NBSD_H #include "i386/tm-i386.h" +#include "solib.h" #endif /* TM_NBSD_H */ diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c index dccd5cd5eae..8d32a03974d 100644 --- a/gdb/i386nbsd-tdep.c +++ b/gdb/i386nbsd-tdep.c @@ -29,6 +29,8 @@ #include "i387-tdep.h" #include "nbsd-tdep.h" +#include "solib-svr4.h" + /* Map a GDB register number to an offset in the reg structure. */ static int regmap[] = { @@ -275,6 +277,8 @@ i386nbsdelf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* NetBSD ELF uses SVR4-style shared libraries. */ set_gdbarch_in_solib_call_trampoline (gdbarch, generic_in_solib_call_trampoline); + set_solib_svr4_fetch_link_map_offsets (gdbarch, + nbsd_ilp32_solib_svr4_fetch_link_map_offsets); /* NetBSD ELF uses -fpcc-struct-return by default. */ tdep->struct_return = pcc_struct_return; -- 2.30.2