Reorganize solib.c.

41 files changed, 1905 insertions, 1590 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b0930935edd..e9a4300bcaa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,97 @@
 2000-10-24  Kevin Buettner  <kevinb@redhat.com>
 
+	* solib-svr4.c: New file created out of much of solib.c...
+
+	* solib.c (_SYSCALL32, BKPT_AT_SYMBOL): Move these defines to
+	solib-svr4.c.
+	(sys/types.h, signal.h, sys/param.h, fcntl.h, a.out.h,
+	elf/external.h, link.h): Move these includes to solib-svr4.c.
+	(bkpt_names, debug_base_symbols, main_name_list,
+	solib_extract_address, SOLIB_EXTRACT_ADDRESS, dynamic_copy,
+	ld_2_copy, debug_addr, flag_addr, LM_ADDR, LM_NEXT, LM_NAME,
+	IGNORE_FIRST_LINK_MAP_ENTRY, breakpoint_addr,
+	allocate_rt_common_objfile, solib_add_common_symbols,
+	bfd_lookup_symbol, look_for_base, elf_locate_base, locate_base,
+	first_link_map_member, open_symbol_file_object, match_main,
+	current_sos, interp_text_sect_low, interp_text_sect_high,
+	interp_plt_sect_low, interp_plt_sect_high,
+	in_svr4_dynsym_resolve_code, disable_break, enable_break,
+	special_symbol_handling): Moved to solib-svr4.c.
+	(debug32_copy, shadow_contents, fdmatch)
+	Removed entirely.
+	(struct so_list): Moved to solist.h
+	(MAX_PATH_SIZE): Moved to solist.h and renamed to
+	SO_NAME_MAX_PATH_SIZE.
+
+	* solist.h: New file created from struct so_list in solib.c.
+	(struct lm_info): Add forward declaration.
+	(struct so_list): Remove fields lm, lm32, lmaddr.  Replace with a
+	single field, lm_info, which will be a pointer to target specific
+	data.
+	(struct target_so_ops): New struct.
+	(free_so): Add extern declaration.
+	(current_target_so_ops): Declare new global variable.
+	(solib_map_sections): 
+	(TARGET_SO_LM_ADDR, TARGET_SO_FREE_SO, TARGET_SO_CLEAR_SOLIB,
+	TARGET_SO_SOLIB_CREATE_INFERIOR_HOOK,
+	TARGET_SO_SPECIAL_SYMBOL_HANDLING, TARGET_SO_CURRENT_SOS,
+	TARGET_SO_OPEN_SYMBOL_FILE_OBJECT):  New macros.
+
+	* solib.c (solib_map_sections, free_so, symbol_add_stub,
+	update_solib_list, solib_add, info_shared_library_command,
+	solib_address, clear_solib, solib_create_inferior_hook):  Use
+	new TARGET_SO_* macros to call function on target specific
+	side indirectly.
+	(current_target_so_ops): Define new global variable.
+	(_initialize_solib): Eliminate HAVE_LINK_H ifdef.
+
+	* solib-svr4.h: New file; defines struct link_map_offsets and
+	SVR4_FETCH_LINK_MAP_OFFSETS.
+
+	* solib-svr4.c (_initialize_svr4_solib, svr4_clear_solib,
+	svr4_free_so): New functions.
+	(special_symbol_handling, solib_create_inferior_function_hook,
+	current_sos): Rename by adding a svr4_ prefix.
+	(default_svr4_fetch_link_map_offsets): New function.
+	(LM_ADDR, LM_NEXT, LM_NAME, IGNORE_FIRST_LINK_MAP_ENTRY,
+	first_link_map_member, open_symbol_file_object, svr4_current_sos):
+	Remove dependence on existence of link.h by calling
+	SVR4_FETCH_LINK_MAP_OFFSETS to obtain the offsets of shared library
+	data.  As a result, SVR4 and non-SVR4 versions of many of these
+	functions coalesce into a single function and HAVE_STRUCT_LINK_MAP32
+	ugliness is moved into default_svr4_fetch_link_map_offsets where it
+	is relatively contained.
+	(SOLIB_EXTRACT_ADDRESS): Revert 2000-08-29 change in which
+	solib_extract_address() is called instead of extract_address().
+	(solib_extract_address): Removed.
+
+	* Makefile.in (solib.o): Add solist.h as a dependency.
+	(solib-svr4.o): Add dependencies.
+
+	* sparc-tdep.c (gregset.h): Don't include unless USE_PROC_FS is
+	defined.
+
+	* config/alpha/alpha-linux.mh, config/alpha/fbsd.mh,
+	config/arm/linux.mh, config/i386/fbsd.mh,
+	config/i386/i386dgux.mh, config/i386/i386gnu.mh,
+	config/i386/i386sco5.mh, config/i386/i386sol2.mt,
+	config/i386/i386v4.mh, config/i386/i386v42mp.mh,
+	config/i386/linux.mh, config/i386/nbsd.mh,
+	config/i386/nbsdelf.mh, config/i386/ncr3000.mt,
+	config/i386/ptx4.mh, config/i386/sun386.mt,
+	config/ia64/linux.mh, config/m68k/linux.mh,
+	config/m68k/m68kv4.mh, config/m68k/nbsd.mh,
+	config/m68k/sun2os4.mt, config/m68k/sun3os4.mt,
+	config/m88k/delta88v4.mh, config/mips/mipsv4.mh,
+	config/ns32k/nbsd.mh, config/powerpc/linux.mh,
+	config/powerpc/nbsd.mh, config/powerpc/solaris.mh,
+	config/rs6000/rs6000lynx.mt, config/sparc/linux.mt,
+	config/sparc/nbsd.mh, config/sparc/nbsdelf.mh,
+	config/sparc/sun4os4.mt, config/sparc/sun4sol2.mh
+	(NATDEPFILES):  Add solib-svr4.o to list.
+
+2000-10-24  Kevin Buettner  <kevinb@redhat.com>
+
 	* stabsread.c (dbx_lookup_type, dbx_alloc_type,
 	read_sun_builtin_type, read_sun_floating_type,
 	read_range_type): Protoize.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a1751ccdcc1..ff3d1695376 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1840,7 +1840,11 @@ mon960-rom.o: mon960-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
 	$(inferior_h) target.h serial.h terminal.h
 
 solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-	objfiles.h gnu-regex.h symfile.h target.h gdb_string.h
+	objfiles.h gnu-regex.h symfile.h target.h gdb_string.h solist.h
+
+solib-svr4.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
+	objfiles.h gnu-regex.h symfile.h target.h gdb_string.h solist.h \
+	solib-svr4.h
 
 source.o: source.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
 	$(gdbcore_h) language.h objfiles.h gnu-regex.h symfile.h $(symtab_h) \
diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh
index 458a5d476f0..8792f5518e5 100644
--- a/gdb/config/alpha/alpha-linux.mh
+++ b/gdb/config/alpha/alpha-linux.mh
@@ -3,7 +3,7 @@ XDEPFILES=
 XM_FILE= xm-alphalinux.h
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o \
-	fork-child.o solib.o linux-thread.o lin-thread.o 
+	fork-child.o solib.o solib-svr4.o linux-thread.o lin-thread.o 
 
 LOADLIBES = -ldl -rdynamic
 
diff --git a/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh
index 55b6fc400f9..17fb44d7be2 100644
--- a/gdb/config/alpha/fbsd.mh
+++ b/gdb/config/alpha/fbsd.mh
@@ -1,6 +1,6 @@
 # Host: FreeBSD/Alpha
 XDEPFILES=
-NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o \
+NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o \
 	corelow.o core-regset.o alphabsd-nat.o
 XM_FILE= xm-fbsd.h
 NAT_FILE= nm-fbsd.h
diff --git a/gdb/config/arm/linux.mh b/gdb/config/arm/linux.mh
index 9f503f24a64..f483dde2342 100644
--- a/gdb/config/arm/linux.mh
+++ b/gdb/config/arm/linux.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-linux.h
 XDEPFILES=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o corelow.o \
+NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o corelow.o \
 	     core-regset.o arm-linux-nat.o linux-thread.o lin-thread.o
 
 LOADLIBES= -ldl -rdynamic
diff --git a/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh
index 66ca58fb90d..f2a01fa190d 100644
--- a/gdb/config/i386/fbsd.mh
+++ b/gdb/config/i386/fbsd.mh
@@ -1,6 +1,6 @@
 # Host: Intel 386 running FreeBSD
 XDEPFILES=
 # NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make.
-NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o corelow.o core-aout.o core-regset.o i387-nat.o i386bsd-nat.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o corelow.o core-aout.o core-regset.o i387-nat.o i386bsd-nat.o
 XM_FILE= xm-fbsd.h
 NAT_FILE= nm-fbsd.h
diff --git a/gdb/config/i386/i386dgux.mh b/gdb/config/i386/i386dgux.mh
index bf27e0fd2a4..ca744800c17 100644
--- a/gdb/config/i386/i386dgux.mh
+++ b/gdb/config/i386/i386dgux.mh
@@ -6,5 +6,5 @@ XDEPFILES=
 XM_CLIBS= -lsocket -lnsl
 
 NAT_FILE= nm-i386v4.h
-NATDEPFILES= corelow.o core-regset.o solib.o fork-child.o i386v4-nat.o \
+NATDEPFILES= corelow.o core-regset.o solib.o solib-svr4.o fork-child.o i386v4-nat.o \
 	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu.mh
index 9997264f90d..e871effcca2 100644
--- a/gdb/config/i386/i386gnu.mh
+++ b/gdb/config/i386/i386gnu.mh
@@ -1,6 +1,6 @@
 # Host: Intel 386 running the GNU Hurd
 XDEPFILES= i387-tdep.o
-NATDEPFILES= i386gnu-nat.o gnu-nat.o fork-child.o solib.o corelow.o notify_S.o process_reply_S.o msg_reply_S.o msg_U.o exc_request_U.o exc_request_S.o
+NATDEPFILES= i386gnu-nat.o gnu-nat.o fork-child.o solib.o solib-svr4.o corelow.o notify_S.o process_reply_S.o msg_reply_S.o msg_U.o exc_request_U.o exc_request_S.o
 XM_FILE= xm-i386gnu.h
 NAT_FILE= nm-gnu.h
 MH_CFLAGS = -D_GNU_SOURCE
diff --git a/gdb/config/i386/i386sco5.mh b/gdb/config/i386/i386sco5.mh
index 0a205dd0f0e..d53a2df3890 100644
--- a/gdb/config/i386/i386sco5.mh
+++ b/gdb/config/i386/i386sco5.mh
@@ -13,5 +13,5 @@ XM_CLIBS= -lPW -lsocket
 
 NAT_FILE= nm-i386sco5.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corefile.o core-aout.o \
-	corelow.o i386v-nat.o solib.o
+	corelow.o i386v-nat.o solib.o solib-svr4.o
 
diff --git a/gdb/config/i386/i386sol2.mt b/gdb/config/i386/i386sol2.mt
index 80b576ffe3f..0c4524e78af 100644
--- a/gdb/config/i386/i386sol2.mt
+++ b/gdb/config/i386/i386sol2.mt
@@ -1,3 +1,3 @@
 # Target: Intel 386 running SVR4
-TDEPFILES= i386-tdep.o i387-tdep.o solib.o
+TDEPFILES= i386-tdep.o i387-tdep.o solib.o solib-svr4.o
 TM_FILE= tm-i386sol2.h
diff --git a/gdb/config/i386/i386v4.mh b/gdb/config/i386/i386v4.mh
index 191b492286d..b203a230931 100644
--- a/gdb/config/i386/i386v4.mh
+++ b/gdb/config/i386/i386v4.mh
@@ -6,5 +6,5 @@ XDEPFILES=
 XM_CLIBS= -lsocket -lnsl
 
 NAT_FILE= nm-i386v4.h
-NATDEPFILES= corelow.o core-regset.o solib.o fork-child.o i386v4-nat.o \
+NATDEPFILES= corelow.o core-regset.o solib.o solib-svr4.o fork-child.o i386v4-nat.o \
 	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
diff --git a/gdb/config/i386/i386v42mp.mh b/gdb/config/i386/i386v42mp.mh
index 185b5f046bb..b696f2f9647 100644
--- a/gdb/config/i386/i386v42mp.mh
+++ b/gdb/config/i386/i386v42mp.mh
@@ -8,6 +8,6 @@ XM_CLIBS= -lsocket -lnsl
 # we don't want nm-i386v4.h since that defines LOSING_POLL which isn't
 # appropriate for i386v42mp
 NAT_FILE= nm-i386v42mp.h
-NATDEPFILES= corelow.o core-regset.o solib.o fork-child.o i386v4-nat.o \
+NATDEPFILES= corelow.o core-regset.o solib.o solib-svr4.o fork-child.o i386v4-nat.o \
 	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o uw-thread.o
 
diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh
index 06c5e809a93..43f5277cf5c 100644
--- a/gdb/config/i386/linux.mh
+++ b/gdb/config/i386/linux.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-linux.h
 XDEPFILES=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o corelow.o \
+NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o corelow.o \
 	core-aout.o i386v-nat.o i386-linux-nat.o i387-nat.o \
 	proc-service.o thread-db.o lin-lwp.o
 
diff --git a/gdb/config/i386/nbsd.mh b/gdb/config/i386/nbsd.mh
index c3838e2532a..6a90fb689da 100644
--- a/gdb/config/i386/nbsd.mh
+++ b/gdb/config/i386/nbsd.mh
@@ -1,6 +1,6 @@
 # Host: Intel 386 running NetBSD
 XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o \
-	i386nbsd-nat.o solib.o
+	i386nbsd-nat.o solib.o solib-svr4.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
index 08db3049d9b..52e99fa09b1 100644
--- a/gdb/config/i386/nbsdelf.mh
+++ b/gdb/config/i386/nbsdelf.mh
@@ -1,6 +1,6 @@
 # Host: Intel 386 running NetBSD
 XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o \
-	i386nbsd-nat.o solib.o
+	i386nbsd-nat.o solib.o solib-svr4.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsdelf.h
diff --git a/gdb/config/i386/ncr3000.mt b/gdb/config/i386/ncr3000.mt
index 0bbf9b369cb..6ebefc52e5a 100644
--- a/gdb/config/i386/ncr3000.mt
+++ b/gdb/config/i386/ncr3000.mt
@@ -1,3 +1,3 @@
 # Target: Intel 386 running SVR4
-TDEPFILES= i386-tdep.o i387-tdep.o solib.o
+TDEPFILES= i386-tdep.o i387-tdep.o solib.o solib-svr4.o
 TM_FILE= tm-i386v4.h
diff --git a/gdb/config/i386/ptx4.mh b/gdb/config/i386/ptx4.mh
index 7b9d11b0c85..ba951f05150 100644
--- a/gdb/config/i386/ptx4.mh
+++ b/gdb/config/i386/ptx4.mh
@@ -1,7 +1,7 @@
 # Host: Sequent Symmetry running ptx 1.3, with Weitek 1167 or i387
 
 XM_FILE= xm-ptx4.h
-XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o core-aout.o solib.o core-regset.o
+XDEPFILES= inftarg.o fork-child.o symm-nat.o corelow.o core-aout.o solib.o solib-svr4.o core-regset.o
 XM_CLIBS= -lseq
 
 NAT_FILE= nm-ptx4.h
diff --git a/gdb/config/i386/sun386.mt b/gdb/config/i386/sun386.mt
index 665ca643fd5..152a4a387b2 100644
--- a/gdb/config/i386/sun386.mt
+++ b/gdb/config/i386/sun386.mt
@@ -1,3 +1,3 @@
 # Target: Sun 386i target configuration file.
-TDEPFILES= i386-tdep.o solib.o
+TDEPFILES= i386-tdep.o solib.o solib-svr4.o
 TM_FILE= tm-sun386.h
diff --git a/gdb/config/ia64/linux.mh b/gdb/config/ia64/linux.mh
index 573d62aeaed..f47013ccf10 100644
--- a/gdb/config/ia64/linux.mh
+++ b/gdb/config/ia64/linux.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-linux.h
 XDEPFILES=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o corelow.o \
+NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o corelow.o \
 	core-aout.o core-regset.o ia64-linux-nat.o linux-thread.o lin-thread.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh
index 3504a08f275..21a89455e04 100644
--- a/gdb/config/m68k/linux.mh
+++ b/gdb/config/m68k/linux.mh
@@ -4,7 +4,7 @@ XM_FILE= xm-linux.h
 XDEPFILES=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o \
+NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o \
 	corelow.o core-aout.o core-regset.o m68klinux-nat.o linux-thread.o
 
 GDBSERVER_DEPFILES= low-linux.o
diff --git a/gdb/config/m68k/m68kv4.mh b/gdb/config/m68k/m68kv4.mh
index 714f41584ea..08171abfbcb 100644
--- a/gdb/config/m68k/m68kv4.mh
+++ b/gdb/config/m68k/m68kv4.mh
@@ -4,5 +4,5 @@ XM_FILE= xm-m68kv4.h
 XDEPFILES=
 
 NAT_FILE= nm-sysv4.h
-NATDEPFILES= corelow.o core-regset.o solib.o fork-child.o procfs.o \
+NATDEPFILES= corelow.o core-regset.o solib.o solib-svr4.o fork-child.o procfs.o \
 	proc-api.o proc-events.o proc-flags.o proc-why.o
diff --git a/gdb/config/m68k/nbsd.mh b/gdb/config/m68k/nbsd.mh
index dfb8950d32e..e4f6d4dd02f 100644
--- a/gdb/config/m68k/nbsd.mh
+++ b/gdb/config/m68k/nbsd.mh
@@ -1,6 +1,6 @@
 # Host: Motorola m68k running NetBSD
 XDEPFILES=
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \
-	m68knbsd-nat.o solib.o
+	m68knbsd-nat.o solib.o solib-svr4.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/m68k/sun2os4.mt b/gdb/config/m68k/sun2os4.mt
index d0c56fe1384..20211a3b24f 100644
--- a/gdb/config/m68k/sun2os4.mt
+++ b/gdb/config/m68k/sun2os4.mt
@@ -1,3 +1,3 @@
 # Target: Sun 2, running SunOS 4
-TDEPFILES= solib.o m68k-tdep.o
+TDEPFILES= solib.o solib-svr4.o m68k-tdep.o
 TM_FILE= tm-sun2os4.h
diff --git a/gdb/config/m68k/sun3os4.mt b/gdb/config/m68k/sun3os4.mt
index dbc265fec7d..248b8ad1e3c 100644
--- a/gdb/config/m68k/sun3os4.mt
+++ b/gdb/config/m68k/sun3os4.mt
@@ -1,3 +1,3 @@
 # Target: Sun 3, running SunOS 4, as a target system
-TDEPFILES= solib.o m68k-tdep.o
+TDEPFILES= solib.o solib-svr4.o m68k-tdep.o
 TM_FILE= tm-sun3os4.h
diff --git a/gdb/config/m88k/delta88v4.mh b/gdb/config/m88k/delta88v4.mh
index 5eec21a007a..a225c185f76 100644
--- a/gdb/config/m88k/delta88v4.mh
+++ b/gdb/config/m88k/delta88v4.mh
@@ -4,5 +4,5 @@ XM_FILE= xm-delta88v4.h
 XDEPFILES= 
 
 NAT_FILE= nm-delta88v4.h
-NATDEPFILES= fork-child.o m88k-nat.o corelow.o core-regset.o solib.o \
+NATDEPFILES= fork-child.o m88k-nat.o corelow.o core-regset.o solib.o solib-svr4.o \
 	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
diff --git a/gdb/config/mips/mipsv4.mh b/gdb/config/mips/mipsv4.mh
index ab8e23940bb..61d0ce2245a 100644
--- a/gdb/config/mips/mipsv4.mh
+++ b/gdb/config/mips/mipsv4.mh
@@ -1,5 +1,5 @@
 # Host: Mips running SVR4
 XM_FILE= xm-mipsv4.h
 NAT_FILE= ../nm-sysv4.h
-NATDEPFILES= fork-child.o mipsv4-nat.o corelow.o core-regset.o solib.o \
+NATDEPFILES= fork-child.o mipsv4-nat.o corelow.o core-regset.o solib.o solib-svr4.o \
 	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
diff --git a/gdb/config/ns32k/nbsd.mh b/gdb/config/ns32k/nbsd.mh
index d1fe321083e..691c5475baa 100644
--- a/gdb/config/ns32k/nbsd.mh
+++ b/gdb/config/ns32k/nbsd.mh
@@ -1,6 +1,6 @@
 # Host: PC532 running NetBSD
 XDEPFILES=
 NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o \
-	ns32knbsd-nat.o solib.o
+	ns32knbsd-nat.o solib.o solib-svr4.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/powerpc/linux.mh b/gdb/config/powerpc/linux.mh
index 3bc9961e35b..318af18b896 100644
--- a/gdb/config/powerpc/linux.mh
+++ b/gdb/config/powerpc/linux.mh
@@ -5,7 +5,7 @@ XDEPFILES=
 XM_CLIBS=
 
 NAT_FILE= nm-linux.h
-NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o corelow.o \
+NATDEPFILES= infptrace.o solib.o solib-svr4.o inftarg.o fork-child.o corelow.o \
 core-aout.o core-regset.o ppc-linux-nat.o proc-service.o thread-db.o lin-lwp.o
 
 LOADLIBES = -ldl -rdynamic
diff --git a/gdb/config/powerpc/nbsd.mh b/gdb/config/powerpc/nbsd.mh
index b27aad4be4b..81486931da4 100644
--- a/gdb/config/powerpc/nbsd.mh
+++ b/gdb/config/powerpc/nbsd.mh
@@ -1,5 +1,5 @@
 # Host: PowerPC, running NetBSD
 XDEPFILES=
-NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o solib.o ppcnbsd-nat.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o solib.o solib-svr4.o ppcnbsd-nat.o
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
diff --git a/gdb/config/powerpc/solaris.mh b/gdb/config/powerpc/solaris.mh
index 51d1764eaab..29ad0947178 100644
--- a/gdb/config/powerpc/solaris.mh
+++ b/gdb/config/powerpc/solaris.mh
@@ -5,7 +5,7 @@ XDEPFILES=
 XM_CLIBS= -lsocket -lnsl
 
 NAT_FILE= nm-solaris.h
-NATDEPFILES= corelow.o core-sol2.o solib.o fork-child.o procfs.o \
+NATDEPFILES= corelow.o core-sol2.o solib.o solib-svr4.o fork-child.o procfs.o \
 	proc-api.o proc-events.o proc-flags.o proc-why.o
 
 # If you are compiling with Sun's compiler, add the -xs option to CC
diff --git a/gdb/config/rs6000/rs6000lynx.mt b/gdb/config/rs6000/rs6000lynx.mt
index fae6d8c5709..8c486b7f30b 100644
--- a/gdb/config/rs6000/rs6000lynx.mt
+++ b/gdb/config/rs6000/rs6000lynx.mt
@@ -1,3 +1,3 @@
 # Target: IBM RS6000 running LynxOS
-TDEPFILES= coff-solib.o rs6000-tdep.o ppc-linux-tdep.o
+TDEPFILES= coff-solib.o solib-svr4.o rs6000-tdep.o ppc-linux-tdep.o
 TM_FILE= tm-rs6000ly.h
diff --git a/gdb/config/sparc/linux.mt b/gdb/config/sparc/linux.mt
index ca422e93c65..186c650f61d 100644
--- a/gdb/config/sparc/linux.mt
+++ b/gdb/config/sparc/linux.mt
@@ -1,3 +1,3 @@
 # Target: Sparcstation, running Linux
-TDEPFILES= sparc-tdep.o solib.o
+TDEPFILES= sparc-tdep.o solib.o solib-svr4.o
 TM_FILE= tm-linux.h
diff --git a/gdb/config/sparc/nbsd.mh b/gdb/config/sparc/nbsd.mh
index a47faa1b4ba..ccde33defe4 100644
--- a/gdb/config/sparc/nbsd.mh
+++ b/gdb/config/sparc/nbsd.mh
@@ -2,5 +2,5 @@
 XDEPFILES=
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
-NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o solib-svr4.o
 HOST_IPC=-DBSD_IPC
diff --git a/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh
index bd8c28c1884..440d275f9a5 100644
--- a/gdb/config/sparc/nbsdelf.mh
+++ b/gdb/config/sparc/nbsdelf.mh
@@ -2,5 +2,5 @@
 XDEPFILES=
 XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsdelf.h
-NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o solib-svr4.o
 HOST_IPC=-DBSD_IPC
diff --git a/gdb/config/sparc/sun4os4.mt b/gdb/config/sparc/sun4os4.mt
index 5a4ecb9546e..0dd4bc0f538 100644
--- a/gdb/config/sparc/sun4os4.mt
+++ b/gdb/config/sparc/sun4os4.mt
@@ -1,3 +1,3 @@
 # Target: Sun 4 or Sparcstation, running SunOS 4
-TDEPFILES= sparc-tdep.o solib.o
+TDEPFILES= sparc-tdep.o solib.o solib-svr4.o
 TM_FILE= tm-sun4os4.h
diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh
index e6c1201839c..4ab69c514eb 100644
--- a/gdb/config/sparc/sun4sol2.mh
+++ b/gdb/config/sparc/sun4sol2.mh
@@ -5,7 +5,7 @@ XDEPFILES=
 XM_CLIBS= -lsocket -lnsl
 
 NAT_FILE= nm-sun4sol2.h
-NATDEPFILES= corelow.o core-sol2.o solib.o fork-child.o procfs.o \
+NATDEPFILES= corelow.o core-sol2.o solib.o solib-svr4.o fork-child.o procfs.o \
 	proc-api.o proc-events.o proc-flags.o proc-why.o
 
 # If you are compiling with Sun's compiler, add the -xs option to CC
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
new file mode 100644
index 00000000000..13fea47e52d
--- /dev/null
+++ b/gdb/solib-svr4.c
@@ -0,0 +1,1586 @@
+/* Handle SunOS and SVR4 shared libraries for GDB, the GNU Debugger.
+   Copyright 1990, 91, 92, 93, 94, 95, 96, 98, 1999, 2000
+   Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#define _SYSCALL32	/* for Sparc64 cross Sparc32 */
+#include "defs.h"
+
+
+#include <sys/types.h>
+#include <signal.h>
+#include "gdb_string.h"
+#include <sys/param.h>
+#include <fcntl.h>
+
+#ifndef SVR4_SHARED_LIBS
+ /* SunOS shared libs need the nlist structure.  */
+#include <a.out.h>
+#else
+#include "elf/external.h"
+#endif
+
+#ifdef HAVE_LINK_H
+#include <link.h>
+#endif
+
+#include "symtab.h"
+#include "bfd.h"
+#include "symfile.h"
+#include "objfiles.h"
+#include "gdbcore.h"
+#include "command.h"
+#include "target.h"
+#include "frame.h"
+#include "gdb_regex.h"
+#include "inferior.h"
+#include "environ.h"
+#include "language.h"
+#include "gdbcmd.h"
+
+#include "solist.h"
+#include "solib-svr4.h"
+
+/* Link map info to include in an allocated so_list entry */
+
+struct lm_info
+  {
+    /* Pointer to copy of link map from inferior.  The type is char *
+       rather than void *, so that we may use byte offsets to find the
+       various fields without the need for a cast.  */
+    char *lm;
+  };
+
+/* On SVR4 systems, a list of symbols in the dynamic linker where
+   GDB can try to place a breakpoint to monitor shared library
+   events.
+
+   If none of these symbols are found, or other errors occur, then
+   SVR4 systems will fall back to using a symbol as the "startup
+   mapping complete" breakpoint address.  */
+
+#ifdef SVR4_SHARED_LIBS
+static char *solib_break_names[] =
+{
+  "r_debug_state",
+  "_r_debug_state",
+  "_dl_debug_state",
+  "rtld_db_dlactivity",
+  NULL
+};
+#endif
+
+#define BKPT_AT_SYMBOL 1
+
+#if defined (BKPT_AT_SYMBOL) && defined (SVR4_SHARED_LIBS)
+static char *bkpt_names[] =
+{
+#ifdef SOLIB_BKPT_NAME
+  SOLIB_BKPT_NAME,		/* Prefer configured name if it exists. */
+#endif
+  "_start",
+  "main",
+  NULL
+};
+#endif
+
+/* Symbols which are used to locate the base of the link map structures. */
+
+#ifndef SVR4_SHARED_LIBS
+static char *debug_base_symbols[] =
+{
+  "_DYNAMIC",
+  "_DYNAMIC__MGC",
+  NULL
+};
+#endif
+
+static char *main_name_list[] =
+{
+  "main_$main",
+  NULL
+};
+
+
+/* Fetch (and possibly build) an appropriate link_map_offsets structure
+   for native targets using struct definitions from link.h.  */
+
+struct link_map_offsets *
+default_svr4_fetch_link_map_offsets (void)
+{
+#ifdef HAVE_LINK_H
+  static struct link_map_offsets lmo;
+  static struct link_map_offsets *lmp = 0;
+#if defined (HAVE_STRUCT_LINK_MAP32)
+  static struct link_map_offsets lmo32;
+  static struct link_map_offsets *lmp32 = 0;
+#endif
+
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+#endif
+#define fieldsize(TYPE, MEMBER) (sizeof (((TYPE *)0)->MEMBER))
+
+  if (lmp == 0)
+    {
+      lmp = &lmo;
+
+#ifdef SVR4_SHARED_LIBS
+      lmo.r_debug_size = sizeof (struct r_debug);
+
+      lmo.r_map_offset = offsetof (struct r_debug, r_map);
+      lmo.r_map_size = fieldsize (struct r_debug, r_map);
+
+      lmo.link_map_size = sizeof (struct link_map);
+
+      lmo.l_addr_offset = offsetof (struct link_map, l_addr);
+      lmo.l_addr_size = fieldsize (struct link_map, l_addr);
+
+      lmo.l_next_offset = offsetof (struct link_map, l_next);
+      lmo.l_next_size = fieldsize (struct link_map, l_next);
+
+      lmo.l_prev_offset = offsetof (struct link_map, l_prev);
+      lmo.l_prev_size = fieldsize (struct link_map, l_prev);
+
+      lmo.l_name_offset = offsetof (struct link_map, l_name);
+      lmo.l_name_size = fieldsize (struct link_map, l_name);
+#else /* !SVR4_SHARED_LIBS */
+      lmo.link_map_size = sizeof (struct link_map);
+
+      lmo.l_addr_offset = offsetof (struct link_map, lm_addr);
+      lmo.l_addr_size = fieldsize (struct link_map, lm_addr);
+
+      lmo.l_next_offset = offsetof (struct link_map, lm_next);
+      lmo.l_next_size = fieldsize (struct link_map, lm_next);
+
+      lmo.l_name_offset = offsetof (struct link_map, lm_name);
+      lmo.l_name_size = fieldsize (struct link_map, lm_name);
+#endif /* SVR4_SHARED_LIBS */
+    }
+
+#if defined (HAVE_STRUCT_LINK_MAP32)
+  if (lmp32 == 0)
+    {
+      lmp32 = &lmo32;
+
+      lmo32.r_debug_size = sizeof (struct r_debug32);
+
+      lmo32.r_map_offset = offsetof (struct r_debug32, r_map);
+      lmo32.r_map_size = fieldsize (struct r_debug32, r_map);
+
+      lmo32.link_map_size = sizeof (struct link_map32);
+
+      lmo32.l_addr_offset = offsetof (struct link_map32, l_addr);
+      lmo32.l_addr_size = fieldsize (struct link_map32, l_addr);
+
+      lmo32.l_next_offset = offsetof (struct link_map32, l_next);
+      lmo32.l_next_size = fieldsize (struct link_map32, l_next);
+
+      lmo32.l_prev_offset = offsetof (struct link_map32, l_prev);
+      lmo32.l_prev_size = fieldsize (struct link_map32, l_prev);
+
+      lmo32.l_name_offset = offsetof (struct link_map32, l_name);
+      lmo32.l_name_size = fieldsize (struct link_map32, l_name);
+    }
+#endif /* defined (HAVE_STRUCT_LINK_MAP32) */
+
+#if defined (HAVE_STRUCT_LINK_MAP32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
+    return lmp32;
+  else
+#endif
+    return lmp;
+
+#else
+
+  internal_error ("default_svr4_fetch_link_map_offsets called without HAVE_LINK_H defined.");
+  return 0;
+
+#endif /* HAVE_LINK_H */
+}
+
+/* Macro to extract an address from a solib structure.
+   When GDB is configured for some 32-bit targets (e.g. Solaris 2.7
+   sparc), BFD is configured to handle 64-bit targets, so CORE_ADDR is
+   64 bits.  We have to extract only the significant bits of addresses
+   to get the right address when accessing the core file BFD.  */
+
+#define SOLIB_EXTRACT_ADDRESS(MEMBER) \
+	extract_address (&(MEMBER), sizeof (MEMBER))
+
+/* local data declarations */
+
+#ifndef SVR4_SHARED_LIBS
+
+/* NOTE: converted the macros LM_ADDR, LM_NEXT, LM_NAME and
+   IGNORE_FIRST_LINK_MAP_ENTRY into functions (see below).
+   MVS, June 2000  */
+
+static struct link_dynamic dynamic_copy;
+static struct link_dynamic_2 ld_2_copy;
+static struct ld_debug debug_copy;
+static CORE_ADDR debug_addr;
+static CORE_ADDR flag_addr;
+
+#endif /* !SVR4_SHARED_LIBS */
+
+/* link map access functions */
+
+static CORE_ADDR
+LM_ADDR (struct so_list *so)
+{
+  struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
+
+  return extract_address (so->lm_info->lm + lmo->l_addr_offset, lmo->l_addr_size);
+}
+
+static CORE_ADDR
+LM_NEXT (struct so_list *so)
+{
+  struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
+
+  return extract_address (so->lm_info->lm + lmo->l_next_offset, lmo->l_next_size);
+}
+
+static CORE_ADDR
+LM_NAME (struct so_list *so)
+{
+  struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
+
+  return extract_address (so->lm_info->lm + lmo->l_name_offset, lmo->l_name_size);
+}
+
+#ifndef SVR4_SHARED_LIBS
+
+static int 
+IGNORE_FIRST_LINK_MAP_ENTRY (struct so_list *so)
+{
+  return 0;
+}
+
+#else /* SVR4_SHARED_LIBS */
+
+static int
+IGNORE_FIRST_LINK_MAP_ENTRY (struct so_list *so)
+{
+  struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
+
+  return extract_address (so->lm_info->lm + lmo->l_prev_offset,
+                          lmo->l_prev_size) == 0;
+}
+
+#endif /* !SVR4_SHARED_LIBS */
+
+
+static CORE_ADDR debug_base;	/* Base of dynamic linker structures */
+static CORE_ADDR breakpoint_addr;	/* Address where end bkpt is set */
+
+/* Local function prototypes */
+
+static int match_main (char *);
+
+/* If non-zero, this is a prefix that will be added to the front of the name
+   shared libraries with an absolute filename for loading.  */
+static char *solib_absolute_prefix = NULL;
+
+/* If non-empty, this is a search path for loading non-absolute shared library
+   symbol files.  This takes precedence over the environment variables PATH
+   and LD_LIBRARY_PATH.  */
+static char *solib_search_path = NULL;
+
+
+#ifndef SVR4_SHARED_LIBS
+
+/* Allocate the runtime common object file.  */
+
+static void
+allocate_rt_common_objfile (void)
+{
+  struct objfile *objfile;
+  struct objfile *last_one;
+
+  objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
+  memset (objfile, 0, sizeof (struct objfile));
+  objfile->md = NULL;
+  obstack_specify_allocation (&objfile->psymbol_cache.cache, 0, 0,
+			      xmalloc, free);
+  obstack_specify_allocation (&objfile->psymbol_obstack, 0, 0, xmalloc,
+			      free);
+  obstack_specify_allocation (&objfile->symbol_obstack, 0, 0, xmalloc,
+			      free);
+  obstack_specify_allocation (&objfile->type_obstack, 0, 0, xmalloc,
+			      free);
+  objfile->name = mstrsave (objfile->md, "rt_common");
+
+  /* Add this file onto the tail of the linked list of other such files. */
+
+  objfile->next = NULL;
+  if (object_files == NULL)
+    object_files = objfile;
+  else
+    {
+      for (last_one = object_files;
+	   last_one->next;
+	   last_one = last_one->next);
+      last_one->next = objfile;
+    }
+
+  rt_common_objfile = objfile;
+}
+
+/* Read all dynamically loaded common symbol definitions from the inferior
+   and put them into the minimal symbol table for the runtime common
+   objfile.  */
+
+static void
+solib_add_common_symbols (CORE_ADDR rtc_symp)
+{
+  struct rtc_symb inferior_rtc_symb;
+  struct nlist inferior_rtc_nlist;
+  int len;
+  char *name;
+
+  /* Remove any runtime common symbols from previous runs.  */
+
+  if (rt_common_objfile != NULL && rt_common_objfile->minimal_symbol_count)
+    {
+      obstack_free (&rt_common_objfile->symbol_obstack, 0);
+      obstack_specify_allocation (&rt_common_objfile->symbol_obstack, 0, 0,
+				  xmalloc, free);
+      rt_common_objfile->minimal_symbol_count = 0;
+      rt_common_objfile->msymbols = NULL;
+    }
+
+  init_minimal_symbol_collection ();
+  make_cleanup_discard_minimal_symbols ();
+
+  while (rtc_symp)
+    {
+      read_memory (rtc_symp,
+		   (char *) &inferior_rtc_symb,
+		   sizeof (inferior_rtc_symb));
+      read_memory (SOLIB_EXTRACT_ADDRESS (inferior_rtc_symb.rtc_sp),
+		   (char *) &inferior_rtc_nlist,
+		   sizeof (inferior_rtc_nlist));
+      if (inferior_rtc_nlist.n_type == N_COMM)
+	{
+	  /* FIXME: The length of the symbol name is not available, but in the
+	     current implementation the common symbol is allocated immediately
+	     behind the name of the symbol. */
+	  len = inferior_rtc_nlist.n_value - inferior_rtc_nlist.n_un.n_strx;
+
+	  name = xmalloc (len);
+	  read_memory (SOLIB_EXTRACT_ADDRESS (inferior_rtc_nlist.n_un.n_name),
+		       name, len);
+
+	  /* Allocate the runtime common objfile if necessary. */
+	  if (rt_common_objfile == NULL)
+	    allocate_rt_common_objfile ();
+
+	  prim_record_minimal_symbol (name, inferior_rtc_nlist.n_value,
+				      mst_bss, rt_common_objfile);
+	  free (name);
+	}
+      rtc_symp = SOLIB_EXTRACT_ADDRESS (inferior_rtc_symb.rtc_next);
+    }
+
+  /* Install any minimal symbols that have been collected as the current
+     minimal symbols for the runtime common objfile.  */
+
+  install_minimal_symbols (rt_common_objfile);
+}
+
+#endif /* SVR4_SHARED_LIBS */
+
+
+#ifdef SVR4_SHARED_LIBS
+
+static CORE_ADDR bfd_lookup_symbol (bfd *, char *);
+
+/*
+
+   LOCAL FUNCTION
+
+   bfd_lookup_symbol -- lookup the value for a specific symbol
+
+   SYNOPSIS
+
+   CORE_ADDR bfd_lookup_symbol (bfd *abfd, char *symname)
+
+   DESCRIPTION
+
+   An expensive way to lookup the value of a single symbol for
+   bfd's that are only temporary anyway.  This is used by the
+   shared library support to find the address of the debugger
+   interface structures in the shared library.
+
+   Note that 0 is specifically allowed as an error return (no
+   such symbol).
+ */
+
+static CORE_ADDR
+bfd_lookup_symbol (bfd *abfd, char *symname)
+{
+  unsigned int storage_needed;
+  asymbol *sym;
+  asymbol **symbol_table;
+  unsigned int number_of_symbols;
+  unsigned int i;
+  struct cleanup *back_to;
+  CORE_ADDR symaddr = 0;
+
+  storage_needed = bfd_get_symtab_upper_bound (abfd);
+
+  if (storage_needed > 0)
+    {
+      symbol_table = (asymbol **) xmalloc (storage_needed);
+      back_to = make_cleanup (free, (PTR) symbol_table);
+      number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
+
+      for (i = 0; i < number_of_symbols; i++)
+	{
+	  sym = *symbol_table++;
+	  if (STREQ (sym->name, symname))
+	    {
+	      /* Bfd symbols are section relative. */
+	      symaddr = sym->value + sym->section->vma;
+	      break;
+	    }
+	}
+      do_cleanups (back_to);
+    }
+
+  if (symaddr)
+    return symaddr;
+
+  /* On FreeBSD, the dynamic linker is stripped by default.  So we'll
+     have to check the dynamic string table too.  */
+
+  storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
+
+  if (storage_needed > 0)
+    {
+      symbol_table = (asymbol **) xmalloc (storage_needed);
+      back_to = make_cleanup (free, (PTR) symbol_table);
+      number_of_symbols = bfd_canonicalize_dynamic_symtab (abfd, symbol_table);
+
+      for (i = 0; i < number_of_symbols; i++)
+	{
+	  sym = *symbol_table++;
+	  if (STREQ (sym->name, symname))
+	    {
+	      /* Bfd symbols are section relative. */
+	      symaddr = sym->value + sym->section->vma;
+	      break;
+	    }
+	}
+      do_cleanups (back_to);
+    }
+
+  return symaddr;
+}
+
+#ifdef HANDLE_SVR4_EXEC_EMULATORS
+
+/*
+   Solaris BCP (the part of Solaris which allows it to run SunOS4
+   a.out files) throws in another wrinkle. Solaris does not fill
+   in the usual a.out link map structures when running BCP programs,
+   the only way to get at them is via groping around in the dynamic
+   linker.
+   The dynamic linker and it's structures are located in the shared
+   C library, which gets run as the executable's "interpreter" by
+   the kernel.
+
+   Note that we can assume nothing about the process state at the time
+   we need to find these structures.  We may be stopped on the first
+   instruction of the interpreter (C shared library), the first
+   instruction of the executable itself, or somewhere else entirely
+   (if we attached to the process for example).
+ */
+
+static char *debug_base_symbols[] =
+{
+  "r_debug",			/* Solaris 2.3 */
+  "_r_debug",			/* Solaris 2.1, 2.2 */
+  NULL
+};
+
+static int look_for_base (int, CORE_ADDR);
+
+/*
+
+   LOCAL FUNCTION
+
+   look_for_base -- examine file for each mapped address segment
+
+   SYNOPSYS
+
+   static int look_for_base (int fd, CORE_ADDR baseaddr)
+
+   DESCRIPTION
+
+   This function is passed to proc_iterate_over_mappings, which
+   causes it to get called once for each mapped address space, with
+   an open file descriptor for the file mapped to that space, and the
+   base address of that mapped space.
+
+   Our job is to find the debug base symbol in the file that this
+   fd is open on, if it exists, and if so, initialize the dynamic
+   linker structure base address debug_base.
+
+   Note that this is a computationally expensive proposition, since
+   we basically have to open a bfd on every call, so we specifically
+   avoid opening the exec file.
+ */
+
+static int
+look_for_base (int fd, CORE_ADDR baseaddr)
+{
+  bfd *interp_bfd;
+  CORE_ADDR address = 0;
+  char **symbolp;
+
+  /* If the fd is -1, then there is no file that corresponds to this
+     mapped memory segment, so skip it.  Also, if the fd corresponds
+     to the exec file, skip it as well. */
+
+  if (fd == -1
+      || (exec_bfd != NULL
+	  && fdmatch (fileno ((FILE *) (exec_bfd->iostream)), fd)))
+    {
+      return (0);
+    }
+
+  /* Try to open whatever random file this fd corresponds to.  Note that
+     we have no way currently to find the filename.  Don't gripe about
+     any problems we might have, just fail. */
+
+  if ((interp_bfd = bfd_fdopenr ("unnamed", gnutarget, fd)) == NULL)
+    {
+      return (0);
+    }
+  if (!bfd_check_format (interp_bfd, bfd_object))
+    {
+      /* FIXME-leak: on failure, might not free all memory associated with
+         interp_bfd.  */
+      bfd_close (interp_bfd);
+      return (0);
+    }
+
+  /* Now try to find our debug base symbol in this file, which we at
+     least know to be a valid ELF executable or shared library. */
+
+  for (symbolp = debug_base_symbols; *symbolp != NULL; symbolp++)
+    {
+      address = bfd_lookup_symbol (interp_bfd, *symbolp);
+      if (address != 0)
+	{
+	  break;
+	}
+    }
+  if (address == 0)
+    {
+      /* FIXME-leak: on failure, might not free all memory associated with
+         interp_bfd.  */
+      bfd_close (interp_bfd);
+      return (0);
+    }
+
+  /* Eureka!  We found the symbol.  But now we may need to relocate it
+     by the base address.  If the symbol's value is less than the base
+     address of the shared library, then it hasn't yet been relocated
+     by the dynamic linker, and we have to do it ourself.  FIXME: Note
+     that we make the assumption that the first segment that corresponds
+     to the shared library has the base address to which the library
+     was relocated. */
+
+  if (address < baseaddr)
+    {
+      address += baseaddr;
+    }
+  debug_base = address;
+  /* FIXME-leak: on failure, might not free all memory associated with
+     interp_bfd.  */
+  bfd_close (interp_bfd);
+  return (1);
+}
+#endif /* HANDLE_SVR4_EXEC_EMULATORS */
+
+/*
+
+   LOCAL FUNCTION
+
+   elf_locate_base -- locate the base address of dynamic linker structs
+   for SVR4 elf targets.
+
+   SYNOPSIS
+
+   CORE_ADDR elf_locate_base (void)
+
+   DESCRIPTION
+
+   For SVR4 elf targets the address of the dynamic linker's runtime
+   structure is contained within the dynamic info section in the
+   executable file.  The dynamic section is also mapped into the
+   inferior address space.  Because the runtime loader fills in the
+   real address before starting the inferior, we have to read in the
+   dynamic info section from the inferior address space.
+   If there are any errors while trying to find the address, we
+   silently return 0, otherwise the found address is returned.
+
+ */
+
+static CORE_ADDR
+elf_locate_base (void)
+{
+  sec_ptr dyninfo_sect;
+  int dyninfo_sect_size;
+  CORE_ADDR dyninfo_addr;
+  char *buf;
+  char *bufend;
+  int arch_size;
+
+  /* Find the start address of the .dynamic section.  */
+  dyninfo_sect = bfd_get_section_by_name (exec_bfd, ".dynamic");
+  if (dyninfo_sect == NULL)
+    return 0;
+  dyninfo_addr = bfd_section_vma (exec_bfd, dyninfo_sect);
+
+  /* Read in .dynamic section, silently ignore errors.  */
+  dyninfo_sect_size = bfd_section_size (exec_bfd, dyninfo_sect);
+  buf = alloca (dyninfo_sect_size);
+  if (target_read_memory (dyninfo_addr, buf, dyninfo_sect_size))
+    return 0;
+
+  /* Find the DT_DEBUG entry in the the .dynamic section.
+     For mips elf we look for DT_MIPS_RLD_MAP, mips elf apparently has
+     no DT_DEBUG entries.  */
+
+  arch_size = bfd_get_arch_size (exec_bfd);
+  if (arch_size == -1)	/* failure */
+    return 0;
+
+  if (arch_size == 32)
+    { /* 32-bit elf */
+      for (bufend = buf + dyninfo_sect_size;
+	   buf < bufend;
+	   buf += sizeof (Elf32_External_Dyn))
+	{
+	  Elf32_External_Dyn *x_dynp = (Elf32_External_Dyn *) buf;
+	  long dyn_tag;
+	  CORE_ADDR dyn_ptr;
+
+	  dyn_tag = bfd_h_get_32 (exec_bfd, (bfd_byte *) x_dynp->d_tag);
+	  if (dyn_tag == DT_NULL)
+	    break;
+	  else if (dyn_tag == DT_DEBUG)
+	    {
+	      dyn_ptr = bfd_h_get_32 (exec_bfd, 
+				      (bfd_byte *) x_dynp->d_un.d_ptr);
+	      return dyn_ptr;
+	    }
+#ifdef DT_MIPS_RLD_MAP
+	  else if (dyn_tag == DT_MIPS_RLD_MAP)
+	    {
+	      char *pbuf;
+
+	      pbuf = alloca (TARGET_PTR_BIT / HOST_CHAR_BIT);
+	      /* DT_MIPS_RLD_MAP contains a pointer to the address
+		 of the dynamic link structure.  */
+	      dyn_ptr = bfd_h_get_32 (exec_bfd, 
+				      (bfd_byte *) x_dynp->d_un.d_ptr);
+	      if (target_read_memory (dyn_ptr, pbuf, sizeof (pbuf)))
+		return 0;
+	      return extract_unsigned_integer (pbuf, sizeof (pbuf));
+	    }
+#endif
+	}
+    }
+  else /* 64-bit elf */
+    {
+      for (bufend = buf + dyninfo_sect_size;
+	   buf < bufend;
+	   buf += sizeof (Elf64_External_Dyn))
+	{
+	  Elf64_External_Dyn *x_dynp = (Elf64_External_Dyn *) buf;
+	  long dyn_tag;
+	  CORE_ADDR dyn_ptr;
+
+	  dyn_tag = bfd_h_get_64 (exec_bfd, (bfd_byte *) x_dynp->d_tag);
+	  if (dyn_tag == DT_NULL)
+	    break;
+	  else if (dyn_tag == DT_DEBUG)
+	    {
+	      dyn_ptr = bfd_h_get_64 (exec_bfd, 
+				      (bfd_byte *) x_dynp->d_un.d_ptr);
+	      return dyn_ptr;
+	    }
+	}
+    }
+
+  /* DT_DEBUG entry not found.  */
+  return 0;
+}
+
+#endif /* SVR4_SHARED_LIBS */
+
+/*
+
+   LOCAL FUNCTION
+
+   locate_base -- locate the base address of dynamic linker structs
+
+   SYNOPSIS
+
+   CORE_ADDR locate_base (void)
+
+   DESCRIPTION
+
+   For both the SunOS and SVR4 shared library implementations, if the
+   inferior executable has been linked dynamically, there is a single
+   address somewhere in the inferior's data space which is the key to
+   locating all of the dynamic linker's runtime structures.  This
+   address is the value of the debug base symbol.  The job of this
+   function is to find and return that address, or to return 0 if there
+   is no such address (the executable is statically linked for example).
+
+   For SunOS, the job is almost trivial, since the dynamic linker and
+   all of it's structures are statically linked to the executable at
+   link time.  Thus the symbol for the address we are looking for has
+   already been added to the minimal symbol table for the executable's
+   objfile at the time the symbol file's symbols were read, and all we
+   have to do is look it up there.  Note that we explicitly do NOT want
+   to find the copies in the shared library.
+
+   The SVR4 version is a bit more complicated because the address
+   is contained somewhere in the dynamic info section.  We have to go
+   to a lot more work to discover the address of the debug base symbol.
+   Because of this complexity, we cache the value we find and return that
+   value on subsequent invocations.  Note there is no copy in the
+   executable symbol tables.
+
+ */
+
+static CORE_ADDR
+locate_base (void)
+{
+
+#ifndef SVR4_SHARED_LIBS
+
+  struct minimal_symbol *msymbol;
+  CORE_ADDR address = 0;
+  char **symbolp;
+
+  /* For SunOS, we want to limit the search for the debug base symbol to the
+     executable being debugged, since there is a duplicate named symbol in the
+     shared library.  We don't want the shared library versions. */
+
+  for (symbolp = debug_base_symbols; *symbolp != NULL; symbolp++)
+    {
+      msymbol = lookup_minimal_symbol (*symbolp, NULL, symfile_objfile);
+      if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
+	{
+	  address = SYMBOL_VALUE_ADDRESS (msymbol);
+	  return (address);
+	}
+    }
+  return (0);
+
+#else /* SVR4_SHARED_LIBS */
+
+  /* Check to see if we have a currently valid address, and if so, avoid
+     doing all this work again and just return the cached address.  If
+     we have no cached address, try to locate it in the dynamic info
+     section for ELF executables.  */
+
+  if (debug_base == 0)
+    {
+      if (exec_bfd != NULL
+	  && bfd_get_flavour (exec_bfd) == bfd_target_elf_flavour)
+	debug_base = elf_locate_base ();
+#ifdef HANDLE_SVR4_EXEC_EMULATORS
+      /* Try it the hard way for emulated executables.  */
+      else if (inferior_pid != 0 && target_has_execution)
+	proc_iterate_over_mappings (look_for_base);
+#endif
+    }
+  return (debug_base);
+
+#endif /* !SVR4_SHARED_LIBS */
+
+}
+
+/*
+
+   LOCAL FUNCTION
+
+   first_link_map_member -- locate first member in dynamic linker's map
+
+   SYNOPSIS
+
+   static CORE_ADDR first_link_map_member (void)
+
+   DESCRIPTION
+
+   Find the first element in the inferior's dynamic link map, and
+   return its address in the inferior.  This function doesn't copy the
+   link map entry itself into our address space; current_sos actually
+   does the reading.  */
+
+static CORE_ADDR
+first_link_map_member (void)
+{
+  CORE_ADDR lm = 0;
+
+#ifndef SVR4_SHARED_LIBS
+
+  read_memory (debug_base, (char *) &dynamic_copy, sizeof (dynamic_copy));
+  if (dynamic_copy.ld_version >= 2)
+    {
+      /* It is a version that we can deal with, so read in the secondary
+         structure and find the address of the link map list from it. */
+      read_memory (SOLIB_EXTRACT_ADDRESS (dynamic_copy.ld_un.ld_2),
+		   (char *) &ld_2_copy, sizeof (struct link_dynamic_2));
+      lm = SOLIB_EXTRACT_ADDRESS (ld_2_copy.ld_loaded);
+    }
+
+#else /* SVR4_SHARED_LIBS */
+  struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
+  char *r_map_buf = xmalloc (lmo->r_map_size);
+  struct cleanup *cleanups = make_cleanup (free, r_map_buf);
+
+  read_memory (debug_base + lmo->r_map_offset, r_map_buf, lmo->r_map_size);
+
+  lm = extract_address (r_map_buf, lmo->r_map_size);
+
+  /* FIXME:  Perhaps we should validate the info somehow, perhaps by
+     checking r_version for a known version number, or r_state for
+     RT_CONSISTENT. */
+
+  do_cleanups (cleanups);
+
+#endif /* !SVR4_SHARED_LIBS */
+
+  return (lm);
+}
+
+#ifdef SVR4_SHARED_LIBS
+/*
+
+  LOCAL FUNCTION
+
+  open_symbol_file_object
+
+  SYNOPSIS
+
+  void open_symbol_file_object (void *from_tty)
+
+  DESCRIPTION
+
+  If no open symbol file, attempt to locate and open the main symbol
+  file.  On SVR4 systems, this is the first link map entry.  If its
+  name is here, we can open it.  Useful when attaching to a process
+  without first loading its symbol file.
+
+  If FROM_TTYP dereferences to a non-zero integer, allow messages to
+  be printed.  This parameter is a pointer rather than an int because
+  open_symbol_file_object() is called via catch_errors() and
+  catch_errors() requires a pointer argument. */
+
+static int
+open_symbol_file_object (void *from_ttyp)
+{
+  CORE_ADDR lm, l_name;
+  char *filename;
+  int errcode;
+  int from_tty = *(int *)from_ttyp;
+  struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
+  char *l_name_buf = xmalloc (lmo->l_name_size);
+  struct cleanup *cleanups = make_cleanup (free, l_name_buf);
+
+  if (symfile_objfile)
+    if (!query ("Attempt to reload symbols from process? "))
+      return 0;
+
+  if ((debug_base = locate_base ()) == 0)
+    return 0;	/* failed somehow... */
+
+  /* First link map member should be the executable.  */
+  if ((lm = first_link_map_member ()) == 0)
+    return 0;	/* failed somehow... */
+
+  /* Read address of name from target memory to GDB.  */
+  read_memory (lm + lmo->l_name_offset, l_name_buf, lmo->l_name_size);
+
+  /* Convert the address to host format.  */
+  l_name = extract_address (l_name_buf, lmo->l_name_size);
+
+  /* Free l_name_buf.  */
+  do_cleanups (cleanups);
+
+  if (l_name == 0)
+    return 0;		/* No filename.  */
+
+  /* Now fetch the filename from target memory.  */
+  target_read_string (l_name, &filename, SO_NAME_MAX_PATH_SIZE - 1, &errcode);
+
+  if (errcode)
+    {
+      warning ("failed to read exec filename from attached file: %s",
+	       safe_strerror (errcode));
+      return 0;
+    }
+
+  make_cleanup (free, filename);
+  /* Have a pathname: read the symbol file.  */
+  symbol_file_command (filename, from_tty);
+
+  return 1;
+}
+#else
+
+static int
+open_symbol_file_object (int *from_ttyp)
+{
+  return 1;
+}
+
+#endif /* SVR4_SHARED_LIBS */
+
+
+/* LOCAL FUNCTION
+
+   current_sos -- build a list of currently loaded shared objects
+
+   SYNOPSIS
+
+   struct so_list *current_sos ()
+
+   DESCRIPTION
+
+   Build a list of `struct so_list' objects describing the shared
+   objects currently loaded in the inferior.  This list does not
+   include an entry for the main executable file.
+
+   Note that we only gather information directly available from the
+   inferior --- we don't examine any of the shared library files
+   themselves.  The declaration of `struct so_list' says which fields
+   we provide values for.  */
+
+static struct so_list *
+svr4_current_sos (void)
+{
+  CORE_ADDR lm;
+  struct so_list *head = 0;
+  struct so_list **link_ptr = &head;
+
+  /* Make sure we've looked up the inferior's dynamic linker's base
+     structure.  */
+  if (! debug_base)
+    {
+      debug_base = locate_base ();
+
+      /* If we can't find the dynamic linker's base structure, this
+	 must not be a dynamically linked executable.  Hmm.  */
+      if (! debug_base)
+	return 0;
+    }
+
+  /* Walk the inferior's link map list, and build our list of
+     `struct so_list' nodes.  */
+  lm = first_link_map_member ();  
+  while (lm)
+    {
+      struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
+      struct so_list *new
+	= (struct so_list *) xmalloc (sizeof (struct so_list));
+      struct cleanup *old_chain = make_cleanup (free, new);
+
+      memset (new, 0, sizeof (*new));
+
+      new->lm_info = xmalloc (sizeof (struct lm_info));
+      make_cleanup (free, new->lm_info);
+
+      new->lm_info->lm = xmalloc (lmo->link_map_size);
+      make_cleanup (free, new->lm_info->lm);
+      memset (new->lm_info->lm, 0, lmo->link_map_size);
+
+      read_memory (lm, new->lm_info->lm, lmo->link_map_size);
+
+      lm = LM_NEXT (new);
+
+      /* For SVR4 versions, the first entry in the link map is for the
+         inferior executable, so we must ignore it.  For some versions of
+         SVR4, it has no name.  For others (Solaris 2.3 for example), it
+         does have a name, so we can no longer use a missing name to
+         decide when to ignore it. */
+      if (IGNORE_FIRST_LINK_MAP_ENTRY (new))
+	free_so (new);
+      else
+	{
+	  int errcode;
+	  char *buffer;
+
+	  /* Extract this shared object's name.  */
+	  target_read_string (LM_NAME (new), &buffer,
+			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
+	  if (errcode != 0)
+	    {
+	      warning ("current_sos: Can't read pathname for load map: %s\n",
+		       safe_strerror (errcode));
+	    }
+	  else
+	    {
+	      strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
+	      new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
+	      free (buffer);
+	      strcpy (new->so_original_name, new->so_name);
+	    }
+
+	  /* If this entry has no name, or its name matches the name
+	     for the main executable, don't include it in the list.  */
+	  if (! new->so_name[0]
+	      || match_main (new->so_name))
+	    free_so (new);
+	  else
+	    {
+	      new->next = 0;
+	      *link_ptr = new;
+	      link_ptr = &new->next;
+	    }
+	}
+
+      discard_cleanups (old_chain);
+    }
+
+  return head;
+}
+
+
+/* On some systems, the only way to recognize the link map entry for
+   the main executable file is by looking at its name.  Return
+   non-zero iff SONAME matches one of the known main executable names.  */
+
+static int
+match_main (char *soname)
+{
+  char **mainp;
+
+  for (mainp = main_name_list; *mainp != NULL; mainp++)
+    {
+      if (strcmp (soname, *mainp) == 0)
+	return (1);
+    }
+
+  return (0);
+}
+
+
+#ifdef SVR4_SHARED_LIBS
+
+/* Return 1 if PC lies in the dynamic symbol resolution code of the
+   SVR4 run time loader.  */
+
+static CORE_ADDR interp_text_sect_low;
+static CORE_ADDR interp_text_sect_high;
+static CORE_ADDR interp_plt_sect_low;
+static CORE_ADDR interp_plt_sect_high;
+
+int
+in_svr4_dynsym_resolve_code (CORE_ADDR pc)
+{
+  return ((pc >= interp_text_sect_low && pc < interp_text_sect_high)
+	  || (pc >= interp_plt_sect_low && pc < interp_plt_sect_high)
+	  || in_plt_section (pc, NULL));
+}
+#endif
+
+/*
+
+   LOCAL FUNCTION
+
+   disable_break -- remove the "mapping changed" breakpoint
+
+   SYNOPSIS
+
+   static int disable_break ()
+
+   DESCRIPTION
+
+   Removes the breakpoint that gets hit when the dynamic linker
+   completes a mapping change.
+
+ */
+
+#ifndef SVR4_SHARED_LIBS
+
+static int
+disable_break (void)
+{
+  int status = 1;
+
+  int in_debugger = 0;
+
+  /* Read the debugger structure from the inferior to retrieve the
+     address of the breakpoint and the original contents of the
+     breakpoint address.  Remove the breakpoint by writing the original
+     contents back. */
+
+  read_memory (debug_addr, (char *) &debug_copy, sizeof (debug_copy));
+
+  /* Set `in_debugger' to zero now. */
+
+  write_memory (flag_addr, (char *) &in_debugger, sizeof (in_debugger));
+
+  breakpoint_addr = SOLIB_EXTRACT_ADDRESS (debug_copy.ldd_bp_addr);
+  write_memory (breakpoint_addr, (char *) &debug_copy.ldd_bp_inst,
+		sizeof (debug_copy.ldd_bp_inst));
+
+  /* For the SVR4 version, we always know the breakpoint address.  For the
+     SunOS version we don't know it until the above code is executed.
+     Grumble if we are stopped anywhere besides the breakpoint address. */
+
+  if (stop_pc != breakpoint_addr)
+    {
+      warning ("stopped at unknown breakpoint while handling shared libraries");
+    }
+
+  return (status);
+}
+
+#endif /* #ifdef SVR4_SHARED_LIBS */
+
+/*
+
+   LOCAL FUNCTION
+
+   enable_break -- arrange for dynamic linker to hit breakpoint
+
+   SYNOPSIS
+
+   int enable_break (void)
+
+   DESCRIPTION
+
+   Both the SunOS and the SVR4 dynamic linkers have, as part of their
+   debugger interface, support for arranging for the inferior to hit
+   a breakpoint after mapping in the shared libraries.  This function
+   enables that breakpoint.
+
+   For SunOS, there is a special flag location (in_debugger) which we
+   set to 1.  When the dynamic linker sees this flag set, it will set
+   a breakpoint at a location known only to itself, after saving the
+   original contents of that place and the breakpoint address itself,
+   in it's own internal structures.  When we resume the inferior, it
+   will eventually take a SIGTRAP when it runs into the breakpoint.
+   We handle this (in a different place) by restoring the contents of
+   the breakpointed location (which is only known after it stops),
+   chasing around to locate the shared libraries that have been
+   loaded, then resuming.
+
+   For SVR4, the debugger interface structure contains a member (r_brk)
+   which is statically initialized at the time the shared library is
+   built, to the offset of a function (_r_debug_state) which is guaran-
+   teed to be called once before mapping in a library, and again when
+   the mapping is complete.  At the time we are examining this member,
+   it contains only the unrelocated offset of the function, so we have
+   to do our own relocation.  Later, when the dynamic linker actually
+   runs, it relocates r_brk to be the actual address of _r_debug_state().
+
+   The debugger interface structure also contains an enumeration which
+   is set to either RT_ADD or RT_DELETE prior to changing the mapping,
+   depending upon whether or not the library is being mapped or unmapped,
+   and then set to RT_CONSISTENT after the library is mapped/unmapped.
+ */
+
+static int
+enable_break (void)
+{
+  int success = 0;
+
+#ifndef SVR4_SHARED_LIBS
+
+  int j;
+  int in_debugger;
+
+  /* Get link_dynamic structure */
+
+  j = target_read_memory (debug_base, (char *) &dynamic_copy,
+			  sizeof (dynamic_copy));
+  if (j)
+    {
+      /* unreadable */
+      return (0);
+    }
+
+  /* Calc address of debugger interface structure */
+
+  debug_addr = SOLIB_EXTRACT_ADDRESS (dynamic_copy.ldd);
+
+  /* Calc address of `in_debugger' member of debugger interface structure */
+
+  flag_addr = debug_addr + (CORE_ADDR) ((char *) &debug_copy.ldd_in_debugger -
+					(char *) &debug_copy);
+
+  /* Write a value of 1 to this member.  */
+
+  in_debugger = 1;
+  write_memory (flag_addr, (char *) &in_debugger, sizeof (in_debugger));
+  success = 1;
+
+#else /* SVR4_SHARED_LIBS */
+
+#ifdef BKPT_AT_SYMBOL
+
+  struct minimal_symbol *msymbol;
+  char **bkpt_namep;
+  asection *interp_sect;
+
+  /* First, remove all the solib event breakpoints.  Their addresses
+     may have changed since the last time we ran the program.  */
+  remove_solib_event_breakpoints ();
+
+#ifdef SVR4_SHARED_LIBS
+  interp_text_sect_low = interp_text_sect_high = 0;
+  interp_plt_sect_low = interp_plt_sect_high = 0;
+
+  /* Find the .interp section; if not found, warn the user and drop
+     into the old breakpoint at symbol code.  */
+  interp_sect = bfd_get_section_by_name (exec_bfd, ".interp");
+  if (interp_sect)
+    {
+      unsigned int interp_sect_size;
+      char *buf;
+      CORE_ADDR load_addr;
+      bfd *tmp_bfd;
+      CORE_ADDR sym_addr = 0;
+
+      /* Read the contents of the .interp section into a local buffer;
+         the contents specify the dynamic linker this program uses.  */
+      interp_sect_size = bfd_section_size (exec_bfd, interp_sect);
+      buf = alloca (interp_sect_size);
+      bfd_get_section_contents (exec_bfd, interp_sect,
+				buf, 0, interp_sect_size);
+
+      /* Now we need to figure out where the dynamic linker was
+         loaded so that we can load its symbols and place a breakpoint
+         in the dynamic linker itself.
+
+         This address is stored on the stack.  However, I've been unable
+         to find any magic formula to find it for Solaris (appears to
+         be trivial on GNU/Linux).  Therefore, we have to try an alternate
+         mechanism to find the dynamic linker's base address.  */
+      tmp_bfd = bfd_openr (buf, gnutarget);
+      if (tmp_bfd == NULL)
+	goto bkpt_at_symbol;
+
+      /* Make sure the dynamic linker's really a useful object.  */
+      if (!bfd_check_format (tmp_bfd, bfd_object))
+	{
+	  warning ("Unable to grok dynamic linker %s as an object file", buf);
+	  bfd_close (tmp_bfd);
+	  goto bkpt_at_symbol;
+	}
+
+      /* We find the dynamic linker's base address by examining the
+         current pc (which point at the entry point for the dynamic
+         linker) and subtracting the offset of the entry point.  */
+      load_addr = read_pc () - tmp_bfd->start_address;
+
+      /* Record the relocated start and end address of the dynamic linker
+         text and plt section for in_svr4_dynsym_resolve_code.  */
+      interp_sect = bfd_get_section_by_name (tmp_bfd, ".text");
+      if (interp_sect)
+	{
+	  interp_text_sect_low =
+	    bfd_section_vma (tmp_bfd, interp_sect) + load_addr;
+	  interp_text_sect_high =
+	    interp_text_sect_low + bfd_section_size (tmp_bfd, interp_sect);
+	}
+      interp_sect = bfd_get_section_by_name (tmp_bfd, ".plt");
+      if (interp_sect)
+	{
+	  interp_plt_sect_low =
+	    bfd_section_vma (tmp_bfd, interp_sect) + load_addr;
+	  interp_plt_sect_high =
+	    interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
+	}
+
+      /* Now try to set a breakpoint in the dynamic linker.  */
+      for (bkpt_namep = solib_break_names; *bkpt_namep != NULL; bkpt_namep++)
+	{
+	  sym_addr = bfd_lookup_symbol (tmp_bfd, *bkpt_namep);
+	  if (sym_addr != 0)
+	    break;
+	}
+
+      /* We're done with the temporary bfd.  */
+      bfd_close (tmp_bfd);
+
+      if (sym_addr != 0)
+	{
+	  create_solib_event_breakpoint (load_addr + sym_addr);
+	  return 1;
+	}
+
+      /* For whatever reason we couldn't set a breakpoint in the dynamic
+         linker.  Warn and drop into the old code.  */
+    bkpt_at_symbol:
+      warning ("Unable to find dynamic linker breakpoint function.\nGDB will be unable to debug shared library initializers\nand track explicitly loaded dynamic code.");
+    }
+#endif
+
+  /* Scan through the list of symbols, trying to look up the symbol and
+     set a breakpoint there.  Terminate loop when we/if we succeed. */
+
+  breakpoint_addr = 0;
+  for (bkpt_namep = bkpt_names; *bkpt_namep != NULL; bkpt_namep++)
+    {
+      msymbol = lookup_minimal_symbol (*bkpt_namep, NULL, symfile_objfile);
+      if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
+	{
+	  create_solib_event_breakpoint (SYMBOL_VALUE_ADDRESS (msymbol));
+	  return 1;
+	}
+    }
+
+  /* Nothing good happened.  */
+  success = 0;
+
+#endif /* BKPT_AT_SYMBOL */
+
+#endif /* !SVR4_SHARED_LIBS */
+
+  return (success);
+}
+
+/*
+
+   LOCAL FUNCTION
+
+   special_symbol_handling -- additional shared library symbol handling
+
+   SYNOPSIS
+
+   void special_symbol_handling ()
+
+   DESCRIPTION
+
+   Once the symbols from a shared object have been loaded in the usual
+   way, we are called to do any system specific symbol handling that 
+   is needed.
+
+   For SunOS4, this consists of grunging around in the dynamic
+   linkers structures to find symbol definitions for "common" symbols
+   and adding them to the minimal symbol table for the runtime common
+   objfile.
+
+ */
+
+static void
+svr4_special_symbol_handling (void)
+{
+#ifndef SVR4_SHARED_LIBS
+  int j;
+
+  if (debug_addr == 0)
+    {
+      /* Get link_dynamic structure */
+
+      j = target_read_memory (debug_base, (char *) &dynamic_copy,
+			      sizeof (dynamic_copy));
+      if (j)
+	{
+	  /* unreadable */
+	  return;
+	}
+
+      /* Calc address of debugger interface structure */
+      /* FIXME, this needs work for cross-debugging of core files
+         (byteorder, size, alignment, etc).  */
+
+      debug_addr = SOLIB_EXTRACT_ADDRESS (dynamic_copy.ldd);
+    }
+
+  /* Read the debugger structure from the inferior, just to make sure
+     we have a current copy. */
+
+  j = target_read_memory (debug_addr, (char *) &debug_copy,
+			  sizeof (debug_copy));
+  if (j)
+    return;			/* unreadable */
+
+  /* Get common symbol definitions for the loaded object. */
+
+  if (debug_copy.ldd_cp)
+    {
+      solib_add_common_symbols (SOLIB_EXTRACT_ADDRESS (debug_copy.ldd_cp));
+    }
+
+#endif /* !SVR4_SHARED_LIBS */
+}
+
+/*
+
+   GLOBAL FUNCTION
+
+   svr4_solib_create_inferior_hook -- shared library startup support
+
+   SYNOPSIS
+
+   void svr4_solib_create_inferior_hook()
+
+   DESCRIPTION
+
+   When gdb starts up the inferior, it nurses it along (through the
+   shell) until it is ready to execute it's first instruction.  At this
+   point, this function gets called via expansion of the macro
+   SOLIB_CREATE_INFERIOR_HOOK.
+
+   For SunOS executables, this first instruction is typically the
+   one at "_start", or a similar text label, regardless of whether
+   the executable is statically or dynamically linked.  The runtime
+   startup code takes care of dynamically linking in any shared
+   libraries, once gdb allows the inferior to continue.
+
+   For SVR4 executables, this first instruction is either the first
+   instruction in the dynamic linker (for dynamically linked
+   executables) or the instruction at "start" for statically linked
+   executables.  For dynamically linked executables, the system
+   first exec's /lib/libc.so.N, which contains the dynamic linker,
+   and starts it running.  The dynamic linker maps in any needed
+   shared libraries, maps in the actual user executable, and then
+   jumps to "start" in the user executable.
+
+   For both SunOS shared libraries, and SVR4 shared libraries, we
+   can arrange to cooperate with the dynamic linker to discover the
+   names of shared libraries that are dynamically linked, and the
+   base addresses to which they are linked.
+
+   This function is responsible for discovering those names and
+   addresses, and saving sufficient information about them to allow
+   their symbols to be read at a later time.
+
+   FIXME
+
+   Between enable_break() and disable_break(), this code does not
+   properly handle hitting breakpoints which the user might have
+   set in the startup code or in the dynamic linker itself.  Proper
+   handling will probably have to wait until the implementation is
+   changed to use the "breakpoint handler function" method.
+
+   Also, what if child has exit()ed?  Must exit loop somehow.
+ */
+
+void
+svr4_solib_create_inferior_hook (void)
+{
+  /* If we are using the BKPT_AT_SYMBOL code, then we don't need the base
+     yet.  In fact, in the case of a SunOS4 executable being run on
+     Solaris, we can't get it yet.  current_sos will get it when it needs
+     it.  */
+#if !(defined (SVR4_SHARED_LIBS) && defined (BKPT_AT_SYMBOL))
+  if ((debug_base = locate_base ()) == 0)
+    {
+      /* Can't find the symbol or the executable is statically linked. */
+      return;
+    }
+#endif
+
+  if (!enable_break ())
+    {
+      warning ("shared library handler failed to enable breakpoint");
+      return;
+    }
+
+#if !defined(SVR4_SHARED_LIBS) || defined(_SCO_DS)
+  /* SCO and SunOS need the loop below, other systems should be using the
+     special shared library breakpoints and the shared library breakpoint
+     service routine.
+
+     Now run the target.  It will eventually hit the breakpoint, at
+     which point all of the libraries will have been mapped in and we
+     can go groveling around in the dynamic linker structures to find
+     out what we need to know about them. */
+
+  clear_proceed_status ();
+  stop_soon_quietly = 1;
+  stop_signal = TARGET_SIGNAL_0;
+  do
+    {
+      target_resume (-1, 0, stop_signal);
+      wait_for_inferior ();
+    }
+  while (stop_signal != TARGET_SIGNAL_TRAP);
+  stop_soon_quietly = 0;
+
+#if !defined(_SCO_DS)
+  /* We are now either at the "mapping complete" breakpoint (or somewhere
+     else, a condition we aren't prepared to deal with anyway), so adjust
+     the PC as necessary after a breakpoint, disable the breakpoint, and
+     add any shared libraries that were mapped in. */
+
+  if (DECR_PC_AFTER_BREAK)
+    {
+      stop_pc -= DECR_PC_AFTER_BREAK;
+      write_register (PC_REGNUM, stop_pc);
+    }
+
+  if (!disable_break ())
+    {
+      warning ("shared library handler failed to disable breakpoint");
+    }
+
+  if (auto_solib_add)
+    solib_add ((char *) 0, 0, (struct target_ops *) 0);
+#endif /* ! _SCO_DS */
+#endif
+}
+
+static void
+svr4_clear_solib (void)
+{
+  debug_base = 0;
+}
+
+static void
+svr4_free_so (struct so_list *so)
+{
+  free (so->lm_info->lm);
+  free (so->lm_info);
+}
+
+static struct target_so_ops svr4_so_ops;
+
+void
+_initialize_svr4_solib (void)
+{
+  svr4_so_ops.lm_addr = LM_ADDR;
+  svr4_so_ops.free_so = svr4_free_so;
+  svr4_so_ops.clear_solib = svr4_clear_solib;
+  svr4_so_ops.solib_create_inferior_hook = svr4_solib_create_inferior_hook;
+  svr4_so_ops.special_symbol_handling = svr4_special_symbol_handling;
+  svr4_so_ops.current_sos = svr4_current_sos;
+  svr4_so_ops.open_symbol_file_object = open_symbol_file_object;
+
+  /* FIXME: Don't do this here.  *_gdbarch_init() should set so_ops. */
+  current_target_so_ops = &svr4_so_ops;
+}
+
diff --git a/gdb/solib-svr4.h b/gdb/solib-svr4.h
new file mode 100644
index 00000000000..d0ce954639e
--- /dev/null
+++ b/gdb/solib-svr4.h
@@ -0,0 +1,70 @@
+/* Handle shared libraries for GDB, the GNU Debugger.
+   Copyright 2000
+   Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* Critical offsets and sizes which describe struct r_debug and
+   struct link_map on SVR4-like targets.  All offsets and sizes are
+   in bytes unless otherwise specified.  */
+
+struct link_map_offsets
+  {
+    /* Size of struct r_debug (or equivalent), or at least enough of it to
+       be able to obtain the r_map field.  */
+    int r_debug_size;
+
+    /* Offset to the r_map field in struct r_debug.  */
+    int r_map_offset;
+
+    /* Size of the r_map field in struct r_debug.  */
+    int r_map_size;
+
+    /* Size of struct link_map (or equivalent), or at least enough of it
+       to be able to obtain the fields below.  */
+    int link_map_size;
+
+    /* Offset to l_addr field in struct link_map.  */
+    int l_addr_offset;
+
+    /* Size of l_addr field in struct link_map.  */
+    int l_addr_size;
+
+    /* Offset to l_next field in struct link_map.  */
+    int l_next_offset;
+
+    /* Size of l_next field in struct link_map.  */
+    int l_next_size;
+
+    /* Offset to l_prev field in struct link_map.  */
+    int l_prev_offset;
+
+    /* Size of l_prev field in struct link_map.  */
+    int l_prev_size;
+
+    /* Offset to l_name field in struct link_map.  */
+    int l_name_offset;
+
+    /* Size of l_name field in struct link_map.  */
+    int l_name_size;
+  };
+
+#ifndef SVR4_FETCH_LINK_MAP_OFFSETS
+extern struct link_map_offsets *default_svr4_fetch_link_map_offsets (void);
+#define SVR4_FETCH_LINK_MAP_OFFSETS() default_svr4_fetch_link_map_offsets ()
+#endif
diff --git a/gdb/solib.c b/gdb/solib.c
index a492dbf0ee1..7efc56eb8e6 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1,4 +1,4 @@
-/* Handle SunOS and SVR4 shared libraries for GDB, the GNU Debugger.
+/* Handle shared libraries for GDB, the GNU Debugger.
    Copyright 1990, 91, 92, 93, 94, 95, 96, 98, 1999, 2000
    Free Software Foundation, Inc.
 
@@ -19,28 +19,11 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#define _SYSCALL32	/* for Sparc64 cross Sparc32 */
 #include "defs.h"
 
-/* This file is only compilable if link.h is available. */
-
-#ifdef HAVE_LINK_H
-
 #include <sys/types.h>
-#include <signal.h>
-#include "gdb_string.h"
-#include <sys/param.h>
 #include <fcntl.h>
-
-#ifndef SVR4_SHARED_LIBS
- /* SunOS shared libs need the nlist structure.  */
-#include <a.out.h>
-#else
-#include "elf/external.h"
-#endif
-
-#include <link.h>
-
+#include "gdb_string.h"
 #include "symtab.h"
 #include "bfd.h"
 #include "symfile.h"
@@ -55,282 +38,23 @@
 #include "language.h"
 #include "gdbcmd.h"
 
-#define MAX_PATH_SIZE 512	/* FIXME: Should be dynamic */
-
-/* On SVR4 systems, a list of symbols in the dynamic linker where
-   GDB can try to place a breakpoint to monitor shared library
-   events.
-
-   If none of these symbols are found, or other errors occur, then
-   SVR4 systems will fall back to using a symbol as the "startup
-   mapping complete" breakpoint address.  */
-
-#ifdef SVR4_SHARED_LIBS
-static char *solib_break_names[] =
-{
-  "r_debug_state",
-  "_r_debug_state",
-  "_dl_debug_state",
-  "rtld_db_dlactivity",
-  NULL
-};
-#endif
-
-#define BKPT_AT_SYMBOL 1
-
-#if defined (BKPT_AT_SYMBOL) && defined (SVR4_SHARED_LIBS)
-static char *bkpt_names[] =
-{
-#ifdef SOLIB_BKPT_NAME
-  SOLIB_BKPT_NAME,		/* Prefer configured name if it exists. */
-#endif
-  "_start",
-  "main",
-  NULL
-};
-#endif
-
-/* Symbols which are used to locate the base of the link map structures. */
-
-#ifndef SVR4_SHARED_LIBS
-static char *debug_base_symbols[] =
-{
-  "_DYNAMIC",
-  "_DYNAMIC__MGC",
-  NULL
-};
-#endif
-
-static char *main_name_list[] =
-{
-  "main_$main",
-  NULL
-};
-
-/* Function to extract an address from a solib structure.
-   When GDB is configured for some 32-bit targets (e.g. Solaris 2.7
-   sparc), BFD is configured to handle 64-bit targets, so CORE_ADDR is
-   64 bits.  We have to extract only the significant bits of addresses
-   to get the right address when accessing the core file BFD.  
-
-   We'll use the BFD itself to determine the number of significant bits.  
-   MVS, June 2000  */
+#include "solist.h"
 
-static CORE_ADDR
-solib_extract_address (void *memberp)
-{
-  return extract_address (memberp, 
-			  bfd_get_arch_size (exec_bfd) / 8);
-}
+/* external data declarations */
 
-#define SOLIB_EXTRACT_ADDRESS(MEMBER) \
-        solib_extract_address (&MEMBER)
+/* FIXME: gdbarch needs to control this variable */
+struct target_so_ops *current_target_so_ops;
 
 /* local data declarations */
 
-#ifndef SVR4_SHARED_LIBS
-
-/* NOTE: converted the macros LM_ADDR, LM_NEXT, LM_NAME and
-   IGNORE_FIRST_LINK_MAP_ENTRY into functions (see below).
-   MVS, June 2000  */
-
-static struct link_dynamic dynamic_copy;
-static struct link_dynamic_2 ld_2_copy;
-static struct ld_debug debug_copy;
-static CORE_ADDR debug_addr;
-static CORE_ADDR flag_addr;
-
-#else /* SVR4_SHARED_LIBS */
-
-static struct r_debug debug_copy;
-#if defined (HAVE_STRUCT_LINK_MAP32)
-static struct r_debug32 debug32_copy;	/* Sparc64 cross Sparc32 */
-#endif
-
-char shadow_contents[BREAKPOINT_MAX];	/* Stash old bkpt addr contents */
-
-#endif /* !SVR4_SHARED_LIBS */
-
-struct so_list
-  {
-    /* The following fields of the structure come directly from the
-       dynamic linker's tables in the inferior, and are initialized by
-       current_sos.  */
-
-    struct so_list *next;	/* next structure in linked list */
-    struct link_map lm;		/* copy of link map from inferior */
-#if defined (HAVE_STRUCT_LINK_MAP32)
-    struct link_map32 lm32;	/* copy of link map from 32-bit inferior */
-#endif
-    CORE_ADDR lmaddr;		/* addr in inferior lm was read from */
-
-    /* Shared object file name, exactly as it appears in the
-       inferior's link map.  This may be a relative path, or something
-       which needs to be looked up in LD_LIBRARY_PATH, etc.  We use it
-       to tell which entries in the inferior's dynamic linker's link
-       map we've already loaded.  */
-    char so_original_name[MAX_PATH_SIZE];
-
-    /* shared object file name, expanded to something GDB can open */
-    char so_name[MAX_PATH_SIZE];
-
-    /* The following fields of the structure are built from
-       information gathered from the shared object file itself, and
-       are initialized when we actually add it to our symbol tables.  */
-
-    bfd *abfd;
-    CORE_ADDR lmend;		/* upper addr bound of mapped object */
-    char symbols_loaded;	/* flag: symbols read in yet? */
-    char from_tty;		/* flag: print msgs? */
-    struct objfile *objfile;	/* objfile for loaded lib */
-    struct section_table *sections;
-    struct section_table *sections_end;
-    struct section_table *textsection;
-  };
-
 static struct so_list *so_list_head;	/* List of known shared objects */
 
-/* link map access functions */
-
-#ifndef SVR4_SHARED_LIBS
-
-static CORE_ADDR
-LM_ADDR (struct so_list *so)
-{
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    return extract_address (&so->lm32.lm_addr, sizeof (so->lm32.lm_addr));
-  else
-#endif
-    return extract_address (&so->lm.lm_addr, sizeof (so->lm.lm_addr));
-}
-
-static CORE_ADDR
-LM_NEXT (struct so_list *so)
-{
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    return extract_address (&so->lm32.lm_next, sizeof (so->lm32.lm_next));
-  else
-#endif
-    return extract_address (&so->lm.lm_next, sizeof (so->lm.lm_next));
-}
-
-static CORE_ADDR
-LM_NAME (struct so_list *so)
-{
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    return extract_address (&so->lm32.lm_name, sizeof (so->lm32.lm_name));
-  else
-#endif
-    return extract_address (&so->lm.lm_name, sizeof (so->lm.lm_name));
-}
-
-static int 
-IGNORE_FIRST_LINK_MAP_ENTRY (struct so_list *so)
-{
-  return 0;
-}
-
-#else /* SVR4_SHARED_LIBS */
-
-static CORE_ADDR
-LM_ADDR (struct so_list *so)
-{
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    return extract_address (&so->lm32.l_addr, sizeof (so->lm32.l_addr));
-  else
-#endif
-    return extract_address (&so->lm.l_addr, sizeof (so->lm.l_addr));
-}
-
-static CORE_ADDR
-LM_NEXT (struct so_list *so)
-{
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    return extract_address (&so->lm32.l_next, sizeof (so->lm32.l_next));
-  else
-#endif
-    return extract_address (&so->lm.l_next, sizeof (so->lm.l_next));
-}
-
-static CORE_ADDR
-LM_NAME (struct so_list *so)
-{
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    return extract_address (&so->lm32.l_name, sizeof (so->lm32.l_name));
-  else
-#endif
-    return extract_address (&so->lm.l_name, sizeof (so->lm.l_name));
-}
-
-static int
-IGNORE_FIRST_LINK_MAP_ENTRY (struct so_list *so)
-{
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    return (solib_extract_address (&(so) -> lm32.l_prev) == 0);
-  else
-#endif
-    return (solib_extract_address (&(so) -> lm.l_prev) == 0);
-}
-
-#endif /* !SVR4_SHARED_LIBS */
-
-
-static CORE_ADDR debug_base;	/* Base of dynamic linker structures */
-static CORE_ADDR breakpoint_addr;	/* Address where end bkpt is set */
-
 static int solib_cleanup_queued = 0;	/* make_run_cleanup called */
 
-extern int fdmatch (int, int);	/* In libiberty */
-
 /* Local function prototypes */
 
 static void do_clear_solib (PTR);
 
-static int match_main (char *);
-
-static void special_symbol_handling (void);
-
-static void sharedlibrary_command (char *, int);
-
-static int enable_break (void);
-
-static void info_sharedlibrary_command (char *, int);
-
-static int symbol_add_stub (PTR);
-
-static CORE_ADDR first_link_map_member (void);
-
-static CORE_ADDR locate_base (void);
-
-static int solib_map_sections (PTR);
-
-#ifdef SVR4_SHARED_LIBS
-
-static CORE_ADDR elf_locate_base (void);
-
-#else
-
-static struct so_list *current_sos (void);
-static void free_so (struct so_list *node);
-
-static int disable_break (void);
-
-static void allocate_rt_common_objfile (void);
-
-static void
-solib_add_common_symbols (CORE_ADDR);
-
-#endif
-
-void _initialize_solib (void);
-
 /* If non-zero, this is a prefix that will be added to the front of the name
    shared libraries with an absolute filename for loading.  */
 static char *solib_absolute_prefix = NULL;
@@ -436,8 +160,8 @@ solib_map_sections (PTR arg)
 
   /* copy full path name into so_name, so that later symbol_file_add can find
      it */
-  if (strlen (scratch_pathname) >= MAX_PATH_SIZE)
-    error ("Full path name length of shared library exceeds MAX_PATH_SIZE in so_list structure.");
+  if (strlen (scratch_pathname) >= SO_NAME_MAX_PATH_SIZE)
+    error ("Full path name length of shared library exceeds SO_NAME_MAX_PATH_SIZE in so_list structure.");
   strcpy (so->so_name, scratch_pathname);
 
   if (!bfd_check_format (abfd, bfd_object))
@@ -456,8 +180,8 @@ solib_map_sections (PTR arg)
       /* Relocate the section binding addresses as recorded in the shared
          object's file by the base address to which the object was actually
          mapped. */
-      p->addr += LM_ADDR (so);
-      p->endaddr += LM_ADDR (so);
+      p->addr += TARGET_SO_LM_ADDR (so);
+      p->endaddr += TARGET_SO_LM_ADDR (so);
       so->lmend = max (p->endaddr, so->lmend);
       if (STREQ (p->the_bfd_section->name, ".text"))
 	{
@@ -471,673 +195,6 @@ solib_map_sections (PTR arg)
   return (1);
 }
 
-#ifndef SVR4_SHARED_LIBS
-
-/* Allocate the runtime common object file.  */
-
-static void
-allocate_rt_common_objfile (void)
-{
-  struct objfile *objfile;
-  struct objfile *last_one;
-
-  objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
-  memset (objfile, 0, sizeof (struct objfile));
-  objfile->md = NULL;
-  obstack_specify_allocation (&objfile->psymbol_cache.cache, 0, 0,
-			      xmalloc, free);
-  obstack_specify_allocation (&objfile->psymbol_obstack, 0, 0, xmalloc,
-			      free);
-  obstack_specify_allocation (&objfile->symbol_obstack, 0, 0, xmalloc,
-			      free);
-  obstack_specify_allocation (&objfile->type_obstack, 0, 0, xmalloc,
-			      free);
-  objfile->name = mstrsave (objfile->md, "rt_common");
-
-  /* Add this file onto the tail of the linked list of other such files. */
-
-  objfile->next = NULL;
-  if (object_files == NULL)
-    object_files = objfile;
-  else
-    {
-      for (last_one = object_files;
-	   last_one->next;
-	   last_one = last_one->next);
-      last_one->next = objfile;
-    }
-
-  rt_common_objfile = objfile;
-}
-
-/* Read all dynamically loaded common symbol definitions from the inferior
-   and put them into the minimal symbol table for the runtime common
-   objfile.  */
-
-static void
-solib_add_common_symbols (CORE_ADDR rtc_symp)
-{
-  struct rtc_symb inferior_rtc_symb;
-  struct nlist inferior_rtc_nlist;
-  int len;
-  char *name;
-
-  /* Remove any runtime common symbols from previous runs.  */
-
-  if (rt_common_objfile != NULL && rt_common_objfile->minimal_symbol_count)
-    {
-      obstack_free (&rt_common_objfile->symbol_obstack, 0);
-      obstack_specify_allocation (&rt_common_objfile->symbol_obstack, 0, 0,
-				  xmalloc, free);
-      rt_common_objfile->minimal_symbol_count = 0;
-      rt_common_objfile->msymbols = NULL;
-    }
-
-  init_minimal_symbol_collection ();
-  make_cleanup_discard_minimal_symbols ();
-
-  while (rtc_symp)
-    {
-      read_memory (rtc_symp,
-		   (char *) &inferior_rtc_symb,
-		   sizeof (inferior_rtc_symb));
-      read_memory (SOLIB_EXTRACT_ADDRESS (inferior_rtc_symb.rtc_sp),
-		   (char *) &inferior_rtc_nlist,
-		   sizeof (inferior_rtc_nlist));
-      if (inferior_rtc_nlist.n_type == N_COMM)
-	{
-	  /* FIXME: The length of the symbol name is not available, but in the
-	     current implementation the common symbol is allocated immediately
-	     behind the name of the symbol. */
-	  len = inferior_rtc_nlist.n_value - inferior_rtc_nlist.n_un.n_strx;
-
-	  name = xmalloc (len);
-	  read_memory (SOLIB_EXTRACT_ADDRESS (inferior_rtc_nlist.n_un.n_name),
-		       name, len);
-
-	  /* Allocate the runtime common objfile if necessary. */
-	  if (rt_common_objfile == NULL)
-	    allocate_rt_common_objfile ();
-
-	  prim_record_minimal_symbol (name, inferior_rtc_nlist.n_value,
-				      mst_bss, rt_common_objfile);
-	  free (name);
-	}
-      rtc_symp = SOLIB_EXTRACT_ADDRESS (inferior_rtc_symb.rtc_next);
-    }
-
-  /* Install any minimal symbols that have been collected as the current
-     minimal symbols for the runtime common objfile.  */
-
-  install_minimal_symbols (rt_common_objfile);
-}
-
-#endif /* SVR4_SHARED_LIBS */
-
-
-#ifdef SVR4_SHARED_LIBS
-
-static CORE_ADDR bfd_lookup_symbol (bfd *, char *);
-
-/*
-
-   LOCAL FUNCTION
-
-   bfd_lookup_symbol -- lookup the value for a specific symbol
-
-   SYNOPSIS
-
-   CORE_ADDR bfd_lookup_symbol (bfd *abfd, char *symname)
-
-   DESCRIPTION
-
-   An expensive way to lookup the value of a single symbol for
-   bfd's that are only temporary anyway.  This is used by the
-   shared library support to find the address of the debugger
-   interface structures in the shared library.
-
-   Note that 0 is specifically allowed as an error return (no
-   such symbol).
- */
-
-static CORE_ADDR
-bfd_lookup_symbol (bfd *abfd, char *symname)
-{
-  unsigned int storage_needed;
-  asymbol *sym;
-  asymbol **symbol_table;
-  unsigned int number_of_symbols;
-  unsigned int i;
-  struct cleanup *back_to;
-  CORE_ADDR symaddr = 0;
-
-  storage_needed = bfd_get_symtab_upper_bound (abfd);
-
-  if (storage_needed > 0)
-    {
-      symbol_table = (asymbol **) xmalloc (storage_needed);
-      back_to = make_cleanup (free, (PTR) symbol_table);
-      number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
-
-      for (i = 0; i < number_of_symbols; i++)
-	{
-	  sym = *symbol_table++;
-	  if (STREQ (sym->name, symname))
-	    {
-	      /* Bfd symbols are section relative. */
-	      symaddr = sym->value + sym->section->vma;
-	      break;
-	    }
-	}
-      do_cleanups (back_to);
-    }
-
-  if (symaddr)
-    return symaddr;
-
-  /* On FreeBSD, the dynamic linker is stripped by default.  So we'll
-     have to check the dynamic string table too.  */
-
-  storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
-
-  if (storage_needed > 0)
-    {
-      symbol_table = (asymbol **) xmalloc (storage_needed);
-      back_to = make_cleanup (free, (PTR) symbol_table);
-      number_of_symbols = bfd_canonicalize_dynamic_symtab (abfd, symbol_table);
-
-      for (i = 0; i < number_of_symbols; i++)
-	{
-	  sym = *symbol_table++;
-	  if (STREQ (sym->name, symname))
-	    {
-	      /* Bfd symbols are section relative. */
-	      symaddr = sym->value + sym->section->vma;
-	      break;
-	    }
-	}
-      do_cleanups (back_to);
-    }
-
-  return symaddr;
-}
-
-#ifdef HANDLE_SVR4_EXEC_EMULATORS
-
-/*
-   Solaris BCP (the part of Solaris which allows it to run SunOS4
-   a.out files) throws in another wrinkle. Solaris does not fill
-   in the usual a.out link map structures when running BCP programs,
-   the only way to get at them is via groping around in the dynamic
-   linker.
-   The dynamic linker and it's structures are located in the shared
-   C library, which gets run as the executable's "interpreter" by
-   the kernel.
-
-   Note that we can assume nothing about the process state at the time
-   we need to find these structures.  We may be stopped on the first
-   instruction of the interpreter (C shared library), the first
-   instruction of the executable itself, or somewhere else entirely
-   (if we attached to the process for example).
- */
-
-static char *debug_base_symbols[] =
-{
-  "r_debug",			/* Solaris 2.3 */
-  "_r_debug",			/* Solaris 2.1, 2.2 */
-  NULL
-};
-
-static int look_for_base (int, CORE_ADDR);
-
-/*
-
-   LOCAL FUNCTION
-
-   look_for_base -- examine file for each mapped address segment
-
-   SYNOPSYS
-
-   static int look_for_base (int fd, CORE_ADDR baseaddr)
-
-   DESCRIPTION
-
-   This function is passed to proc_iterate_over_mappings, which
-   causes it to get called once for each mapped address space, with
-   an open file descriptor for the file mapped to that space, and the
-   base address of that mapped space.
-
-   Our job is to find the debug base symbol in the file that this
-   fd is open on, if it exists, and if so, initialize the dynamic
-   linker structure base address debug_base.
-
-   Note that this is a computationally expensive proposition, since
-   we basically have to open a bfd on every call, so we specifically
-   avoid opening the exec file.
- */
-
-static int
-look_for_base (int fd, CORE_ADDR baseaddr)
-{
-  bfd *interp_bfd;
-  CORE_ADDR address = 0;
-  char **symbolp;
-
-  /* If the fd is -1, then there is no file that corresponds to this
-     mapped memory segment, so skip it.  Also, if the fd corresponds
-     to the exec file, skip it as well. */
-
-  if (fd == -1
-      || (exec_bfd != NULL
-	  && fdmatch (fileno ((FILE *) (exec_bfd->iostream)), fd)))
-    {
-      return (0);
-    }
-
-  /* Try to open whatever random file this fd corresponds to.  Note that
-     we have no way currently to find the filename.  Don't gripe about
-     any problems we might have, just fail. */
-
-  if ((interp_bfd = bfd_fdopenr ("unnamed", gnutarget, fd)) == NULL)
-    {
-      return (0);
-    }
-  if (!bfd_check_format (interp_bfd, bfd_object))
-    {
-      /* FIXME-leak: on failure, might not free all memory associated with
-         interp_bfd.  */
-      bfd_close (interp_bfd);
-      return (0);
-    }
-
-  /* Now try to find our debug base symbol in this file, which we at
-     least know to be a valid ELF executable or shared library. */
-
-  for (symbolp = debug_base_symbols; *symbolp != NULL; symbolp++)
-    {
-      address = bfd_lookup_symbol (interp_bfd, *symbolp);
-      if (address != 0)
-	{
-	  break;
-	}
-    }
-  if (address == 0)
-    {
-      /* FIXME-leak: on failure, might not free all memory associated with
-         interp_bfd.  */
-      bfd_close (interp_bfd);
-      return (0);
-    }
-
-  /* Eureka!  We found the symbol.  But now we may need to relocate it
-     by the base address.  If the symbol's value is less than the base
-     address of the shared library, then it hasn't yet been relocated
-     by the dynamic linker, and we have to do it ourself.  FIXME: Note
-     that we make the assumption that the first segment that corresponds
-     to the shared library has the base address to which the library
-     was relocated. */
-
-  if (address < baseaddr)
-    {
-      address += baseaddr;
-    }
-  debug_base = address;
-  /* FIXME-leak: on failure, might not free all memory associated with
-     interp_bfd.  */
-  bfd_close (interp_bfd);
-  return (1);
-}
-#endif /* HANDLE_SVR4_EXEC_EMULATORS */
-
-/*
-
-   LOCAL FUNCTION
-
-   elf_locate_base -- locate the base address of dynamic linker structs
-   for SVR4 elf targets.
-
-   SYNOPSIS
-
-   CORE_ADDR elf_locate_base (void)
-
-   DESCRIPTION
-
-   For SVR4 elf targets the address of the dynamic linker's runtime
-   structure is contained within the dynamic info section in the
-   executable file.  The dynamic section is also mapped into the
-   inferior address space.  Because the runtime loader fills in the
-   real address before starting the inferior, we have to read in the
-   dynamic info section from the inferior address space.
-   If there are any errors while trying to find the address, we
-   silently return 0, otherwise the found address is returned.
-
- */
-
-static CORE_ADDR
-elf_locate_base (void)
-{
-  sec_ptr dyninfo_sect;
-  int dyninfo_sect_size;
-  CORE_ADDR dyninfo_addr;
-  char *buf;
-  char *bufend;
-  int arch_size;
-
-  /* Find the start address of the .dynamic section.  */
-  dyninfo_sect = bfd_get_section_by_name (exec_bfd, ".dynamic");
-  if (dyninfo_sect == NULL)
-    return 0;
-  dyninfo_addr = bfd_section_vma (exec_bfd, dyninfo_sect);
-
-  /* Read in .dynamic section, silently ignore errors.  */
-  dyninfo_sect_size = bfd_section_size (exec_bfd, dyninfo_sect);
-  buf = alloca (dyninfo_sect_size);
-  if (target_read_memory (dyninfo_addr, buf, dyninfo_sect_size))
-    return 0;
-
-  /* Find the DT_DEBUG entry in the the .dynamic section.
-     For mips elf we look for DT_MIPS_RLD_MAP, mips elf apparently has
-     no DT_DEBUG entries.  */
-
-  arch_size = bfd_get_arch_size (exec_bfd);
-  if (arch_size == -1)	/* failure */
-    return 0;
-
-  if (arch_size == 32)
-    { /* 32-bit elf */
-      for (bufend = buf + dyninfo_sect_size;
-	   buf < bufend;
-	   buf += sizeof (Elf32_External_Dyn))
-	{
-	  Elf32_External_Dyn *x_dynp = (Elf32_External_Dyn *) buf;
-	  long dyn_tag;
-	  CORE_ADDR dyn_ptr;
-
-	  dyn_tag = bfd_h_get_32 (exec_bfd, (bfd_byte *) x_dynp->d_tag);
-	  if (dyn_tag == DT_NULL)
-	    break;
-	  else if (dyn_tag == DT_DEBUG)
-	    {
-	      dyn_ptr = bfd_h_get_32 (exec_bfd, 
-				      (bfd_byte *) x_dynp->d_un.d_ptr);
-	      return dyn_ptr;
-	    }
-#ifdef DT_MIPS_RLD_MAP
-	  else if (dyn_tag == DT_MIPS_RLD_MAP)
-	    {
-	      char *pbuf;
-
-	      pbuf = alloca (TARGET_PTR_BIT / HOST_CHAR_BIT);
-	      /* DT_MIPS_RLD_MAP contains a pointer to the address
-		 of the dynamic link structure.  */
-	      dyn_ptr = bfd_h_get_32 (exec_bfd, 
-				      (bfd_byte *) x_dynp->d_un.d_ptr);
-	      if (target_read_memory (dyn_ptr, pbuf, sizeof (pbuf)))
-		return 0;
-	      return extract_unsigned_integer (pbuf, sizeof (pbuf));
-	    }
-#endif
-	}
-    }
-  else /* 64-bit elf */
-    {
-      for (bufend = buf + dyninfo_sect_size;
-	   buf < bufend;
-	   buf += sizeof (Elf64_External_Dyn))
-	{
-	  Elf64_External_Dyn *x_dynp = (Elf64_External_Dyn *) buf;
-	  long dyn_tag;
-	  CORE_ADDR dyn_ptr;
-
-	  dyn_tag = bfd_h_get_64 (exec_bfd, (bfd_byte *) x_dynp->d_tag);
-	  if (dyn_tag == DT_NULL)
-	    break;
-	  else if (dyn_tag == DT_DEBUG)
-	    {
-	      dyn_ptr = bfd_h_get_64 (exec_bfd, 
-				      (bfd_byte *) x_dynp->d_un.d_ptr);
-	      return dyn_ptr;
-	    }
-	}
-    }
-
-  /* DT_DEBUG entry not found.  */
-  return 0;
-}
-
-#endif /* SVR4_SHARED_LIBS */
-
-/*
-
-   LOCAL FUNCTION
-
-   locate_base -- locate the base address of dynamic linker structs
-
-   SYNOPSIS
-
-   CORE_ADDR locate_base (void)
-
-   DESCRIPTION
-
-   For both the SunOS and SVR4 shared library implementations, if the
-   inferior executable has been linked dynamically, there is a single
-   address somewhere in the inferior's data space which is the key to
-   locating all of the dynamic linker's runtime structures.  This
-   address is the value of the debug base symbol.  The job of this
-   function is to find and return that address, or to return 0 if there
-   is no such address (the executable is statically linked for example).
-
-   For SunOS, the job is almost trivial, since the dynamic linker and
-   all of it's structures are statically linked to the executable at
-   link time.  Thus the symbol for the address we are looking for has
-   already been added to the minimal symbol table for the executable's
-   objfile at the time the symbol file's symbols were read, and all we
-   have to do is look it up there.  Note that we explicitly do NOT want
-   to find the copies in the shared library.
-
-   The SVR4 version is a bit more complicated because the address
-   is contained somewhere in the dynamic info section.  We have to go
-   to a lot more work to discover the address of the debug base symbol.
-   Because of this complexity, we cache the value we find and return that
-   value on subsequent invocations.  Note there is no copy in the
-   executable symbol tables.
-
- */
-
-static CORE_ADDR
-locate_base (void)
-{
-
-#ifndef SVR4_SHARED_LIBS
-
-  struct minimal_symbol *msymbol;
-  CORE_ADDR address = 0;
-  char **symbolp;
-
-  /* For SunOS, we want to limit the search for the debug base symbol to the
-     executable being debugged, since there is a duplicate named symbol in the
-     shared library.  We don't want the shared library versions. */
-
-  for (symbolp = debug_base_symbols; *symbolp != NULL; symbolp++)
-    {
-      msymbol = lookup_minimal_symbol (*symbolp, NULL, symfile_objfile);
-      if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
-	{
-	  address = SYMBOL_VALUE_ADDRESS (msymbol);
-	  return (address);
-	}
-    }
-  return (0);
-
-#else /* SVR4_SHARED_LIBS */
-
-  /* Check to see if we have a currently valid address, and if so, avoid
-     doing all this work again and just return the cached address.  If
-     we have no cached address, try to locate it in the dynamic info
-     section for ELF executables.  */
-
-  if (debug_base == 0)
-    {
-      if (exec_bfd != NULL
-	  && bfd_get_flavour (exec_bfd) == bfd_target_elf_flavour)
-	debug_base = elf_locate_base ();
-#ifdef HANDLE_SVR4_EXEC_EMULATORS
-      /* Try it the hard way for emulated executables.  */
-      else if (inferior_pid != 0 && target_has_execution)
-	proc_iterate_over_mappings (look_for_base);
-#endif
-    }
-  return (debug_base);
-
-#endif /* !SVR4_SHARED_LIBS */
-
-}
-
-/*
-
-   LOCAL FUNCTION
-
-   first_link_map_member -- locate first member in dynamic linker's map
-
-   SYNOPSIS
-
-   static CORE_ADDR first_link_map_member (void)
-
-   DESCRIPTION
-
-   Find the first element in the inferior's dynamic link map, and
-   return its address in the inferior.  This function doesn't copy the
-   link map entry itself into our address space; current_sos actually
-   does the reading.  */
-
-static CORE_ADDR
-first_link_map_member (void)
-{
-  CORE_ADDR lm = 0;
-
-#ifndef SVR4_SHARED_LIBS
-
-  read_memory (debug_base, (char *) &dynamic_copy, sizeof (dynamic_copy));
-  if (dynamic_copy.ld_version >= 2)
-    {
-      /* It is a version that we can deal with, so read in the secondary
-         structure and find the address of the link map list from it. */
-      read_memory (SOLIB_EXTRACT_ADDRESS (dynamic_copy.ld_un.ld_2),
-		   (char *) &ld_2_copy, sizeof (struct link_dynamic_2));
-      lm = SOLIB_EXTRACT_ADDRESS (ld_2_copy.ld_loaded);
-    }
-
-#else /* SVR4_SHARED_LIBS */
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    {
-      read_memory (debug_base, (char *) &debug32_copy, 
-		   sizeof (struct r_debug32));
-      lm = SOLIB_EXTRACT_ADDRESS (debug32_copy.r_map);
-    }
-  else
-#endif
-    {
-      read_memory (debug_base, (char *) &debug_copy, 
-		   sizeof (struct r_debug));
-      lm = SOLIB_EXTRACT_ADDRESS (debug_copy.r_map);
-    }
-  /* FIXME:  Perhaps we should validate the info somehow, perhaps by
-     checking r_version for a known version number, or r_state for
-     RT_CONSISTENT. */
-
-#endif /* !SVR4_SHARED_LIBS */
-
-  return (lm);
-}
-
-#ifdef SVR4_SHARED_LIBS
-/*
-
-  LOCAL FUNCTION
-
-  open_symbol_file_object
-
-  SYNOPSIS
-
-  int open_symbol_file_object (void *from_ttyp)
-
-  DESCRIPTION
-
-  If no open symbol file, attempt to locate and open the main symbol
-  file.  On SVR4 systems, this is the first link map entry.  If its
-  name is here, we can open it.  Useful when attaching to a process
-  without first loading its symbol file.
-
-  If FROM_TTYP dereferences to a non-zero integer, allow messages to
-  be printed.  This parameter is a pointer rather than an int because
-  open_symbol_file_object() is called via catch_errors() and
-  catch_errors() requires a pointer argument. */
-
-static int
-open_symbol_file_object (void *from_ttyp)
-{
-  CORE_ADDR lm;
-  char *filename;
-  int errcode;
-  int from_tty = *(int *)from_ttyp;
-
-  if (symfile_objfile)
-    if (!query ("Attempt to reload symbols from process? "))
-      return 0;
-
-  if ((debug_base = locate_base ()) == 0)
-    return 0;	/* failed somehow... */
-
-  /* First link map member should be the executable.  */
-  if ((lm = first_link_map_member ()) == 0)
-    return 0;	/* failed somehow... */
-
-#if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_get_arch_size (exec_bfd) == 32)
-    {
-      struct link_map32 lmcopy;
-      /* Read from target memory to GDB.  */
-      read_memory (lm, (void *) &lmcopy, sizeof (lmcopy));
-
-      if (lmcopy.l_name == 0)
-	return 0;	/* no filename.  */
-
-      /* Now fetch the filename from target memory.  */
-      target_read_string (SOLIB_EXTRACT_ADDRESS (lmcopy.l_name), 
-			  &filename, MAX_PATH_SIZE - 1, &errcode);
-    }
-  else
-#endif /* HAVE_STRUCT_LINK_MAP32 */
-    {
-      struct link_map lmcopy;
-      /* Read from target memory to GDB.  */
-      read_memory (lm, (void *) &lmcopy, sizeof (lmcopy));
-
-      if (lmcopy.l_name == 0)
-	return 0;	/* no filename.  */
-
-      /* Now fetch the filename from target memory.  */
-      target_read_string (SOLIB_EXTRACT_ADDRESS (lmcopy.l_name), &filename, 
-			  MAX_PATH_SIZE - 1, &errcode);
-    }
-
-  if (errcode)
-    {
-      warning ("failed to read exec filename from attached file: %s",
-	       safe_strerror (errcode));
-      return 0;
-    }
-
-  make_cleanup (free, filename);
-  /* Have a pathname: read the symbol file.  */
-  symbol_file_command (filename, from_tty);
-
-  return 1;
-}
-#endif /* SVR4_SHARED_LIBS */
-
-
 /* LOCAL FUNCTION
 
    free_so --- free a `struct so_list' object
@@ -1159,7 +216,7 @@ open_symbol_file_object (void *from_ttyp)
    objfile associated with SO that needs to be removed, the caller is
    responsible for taking care of that.  */
 
-static void
+void
 free_so (struct so_list *so)
 {
   char *bfd_filename = 0;
@@ -1178,133 +235,9 @@ free_so (struct so_list *so)
   if (bfd_filename)
     free (bfd_filename);
 
-  free (so);
-}
-
-
-/* On some systems, the only way to recognize the link map entry for
-   the main executable file is by looking at its name.  Return
-   non-zero iff SONAME matches one of the known main executable names.  */
-
-static int
-match_main (char *soname)
-{
-  char **mainp;
-
-  for (mainp = main_name_list; *mainp != NULL; mainp++)
-    {
-      if (strcmp (soname, *mainp) == 0)
-	return (1);
-    }
-
-  return (0);
-}
-
+  TARGET_SO_FREE_SO (so);
 
-/* LOCAL FUNCTION
-
-   current_sos -- build a list of currently loaded shared objects
-
-   SYNOPSIS
-
-   struct so_list *current_sos ()
-
-   DESCRIPTION
-
-   Build a list of `struct so_list' objects describing the shared
-   objects currently loaded in the inferior.  This list does not
-   include an entry for the main executable file.
-
-   Note that we only gather information directly available from the
-   inferior --- we don't examine any of the shared library files
-   themselves.  The declaration of `struct so_list' says which fields
-   we provide values for.  */
-
-static struct so_list *
-current_sos (void)
-{
-  CORE_ADDR lm;
-  struct so_list *head = 0;
-  struct so_list **link_ptr = &head;
-
-  /* Make sure we've looked up the inferior's dynamic linker's base
-     structure.  */
-  if (! debug_base)
-    {
-      debug_base = locate_base ();
-
-      /* If we can't find the dynamic linker's base structure, this
-	 must not be a dynamically linked executable.  Hmm.  */
-      if (! debug_base)
-	return 0;
-    }
-
-  /* Walk the inferior's link map list, and build our list of
-     `struct so_list' nodes.  */
-  lm = first_link_map_member ();  
-  while (lm)
-    {
-      struct so_list *new
-	= (struct so_list *) xmalloc (sizeof (struct so_list));
-      struct cleanup *old_chain = make_cleanup (free, new);
-      memset (new, 0, sizeof (*new));
-
-      new->lmaddr = lm;
-
-#if defined (HAVE_STRUCT_LINK_MAP32)
-      if (bfd_get_arch_size (exec_bfd) == 32)
-	read_memory (lm, (char *) &(new->lm32), sizeof (struct link_map32));
-      else
-#endif
-	read_memory (lm, (char *) &(new->lm), sizeof (struct link_map));
-
-      lm = LM_NEXT (new);
-
-      /* For SVR4 versions, the first entry in the link map is for the
-         inferior executable, so we must ignore it.  For some versions of
-         SVR4, it has no name.  For others (Solaris 2.3 for example), it
-         does have a name, so we can no longer use a missing name to
-         decide when to ignore it. */
-      if (IGNORE_FIRST_LINK_MAP_ENTRY (new))
-	free_so (new);
-      else
-	{
-	  int errcode;
-	  char *buffer;
-
-	  /* Extract this shared object's name.  */
-	  target_read_string (LM_NAME (new), &buffer,
-			      MAX_PATH_SIZE - 1, &errcode);
-	  if (errcode != 0)
-	    {
-	      warning ("current_sos: Can't read pathname for load map: %s\n",
-		       safe_strerror (errcode));
-	    }
-	  else
-	    {
-	      strncpy (new->so_name, buffer, MAX_PATH_SIZE - 1);
-	      new->so_name[MAX_PATH_SIZE - 1] = '\0';
-	      free (buffer);
-	      strcpy (new->so_original_name, new->so_name);
-	    }
-
-	  /* If this entry has no name, or its name matches the name
-	     for the main executable, don't include it in the list.  */
-	  if (! new->so_name[0]
-	      || match_main (new->so_name))
-	    free_so (new);
-	  else
-	    {
-	      new->next = 0;
-	      *link_ptr = new;
-	      link_ptr = &new->next;
-	    }
-	}
-
-      discard_cleanups (old_chain);
-    }
-
-  return head;
+  free (so);
 }
 
 
@@ -1345,7 +278,7 @@ symbol_add_stub (PTR arg)
       if (lowest_sect)
 	{
 	  lowest_addr = bfd_section_vma (so->abfd, lowest_sect)
-	    + LM_ADDR (so);
+	    + TARGET_SO_LM_ADDR (so);
 	  lowest_index = lowest_sect->index;
 	}
     }
@@ -1395,21 +328,18 @@ symbol_add_stub (PTR arg)
 void
 update_solib_list (int from_tty, struct target_ops *target)
 {
-  struct so_list *inferior = current_sos ();
+  struct so_list *inferior = TARGET_SO_CURRENT_SOS ();
   struct so_list *gdb, **gdb_link;
 
-#ifdef SVR4_SHARED_LIBS
   /* If we are attaching to a running process for which we 
      have not opened a symbol file, we may be able to get its 
      symbols now!  */
   if (attach_flag &&
       symfile_objfile == NULL)
-    catch_errors (open_symbol_file_object, (PTR) &from_tty, 
+    catch_errors (TARGET_SO_OPEN_SYMBOL_FILE_OBJECT, (PTR) &from_tty, 
 		  "Error reading attached process's symbol file.\n",
 		  RETURN_MASK_ALL);
 
-#endif SVR4_SHARED_LIBS
-
   /* Since this function might actually add some elements to the
      so_list_head list, arrange for it to be cleaned up when
      appropriate.  */
@@ -1615,7 +545,7 @@ solib_add (char *pattern, int from_tty, struct target_ops *target)
 	   frameless.  */
 	reinit_frame_cache ();
 
-	special_symbol_handling ();
+	TARGET_SO_SPECIAL_SYMBOL_HANDLING ();
       }
   }
 }
@@ -1680,8 +610,9 @@ info_sharedlibrary_command (char *ignore, int from_tty)
 	    }
 
 	  printf_unfiltered ("%-*s", addr_width,
-		      local_hex_string_custom ((unsigned long) LM_ADDR (so),
-					       addr_fmt));
+                             local_hex_string_custom (
+			       (unsigned long) TARGET_SO_LM_ADDR (so),
+	                       addr_fmt));
 	  printf_unfiltered ("%-*s", addr_width,
 			 local_hex_string_custom ((unsigned long) so->lmend,
 						  addr_fmt));
@@ -1726,7 +657,7 @@ solib_address (CORE_ADDR address)
 
   for (so = so_list_head; so; so = so->next)
     {
-      if (LM_ADDR (so) <= address && address < so->lmend)
+      if (TARGET_SO_LM_ADDR (so) <= address && address < so->lmend)
 	return (so->so_name);
     }
 
@@ -1769,7 +700,7 @@ clear_solib (void)
       free_so (so);
     }
 
-  debug_base = 0;
+  TARGET_SO_CLEAR_SOLIB ();
 }
 
 static void
@@ -1779,301 +710,7 @@ do_clear_solib (PTR dummy)
   clear_solib ();
 }
 
-#ifdef SVR4_SHARED_LIBS
-
-/* Return 1 if PC lies in the dynamic symbol resolution code of the
-   SVR4 run time loader.  */
-
-static CORE_ADDR interp_text_sect_low;
-static CORE_ADDR interp_text_sect_high;
-static CORE_ADDR interp_plt_sect_low;
-static CORE_ADDR interp_plt_sect_high;
-
-int
-in_svr4_dynsym_resolve_code (CORE_ADDR pc)
-{
-  return ((pc >= interp_text_sect_low && pc < interp_text_sect_high)
-	  || (pc >= interp_plt_sect_low && pc < interp_plt_sect_high)
-	  || in_plt_section (pc, NULL));
-}
-#endif
-
-/*
-
-   LOCAL FUNCTION
-
-   disable_break -- remove the "mapping changed" breakpoint
-
-   SYNOPSIS
-
-   static int disable_break ()
-
-   DESCRIPTION
-
-   Removes the breakpoint that gets hit when the dynamic linker
-   completes a mapping change.
-
- */
-
-#ifndef SVR4_SHARED_LIBS
-
-static int
-disable_break (void)
-{
-  int status = 1;
-
-#ifndef SVR4_SHARED_LIBS
-
-  int in_debugger = 0;
-
-  /* Read the debugger structure from the inferior to retrieve the
-     address of the breakpoint and the original contents of the
-     breakpoint address.  Remove the breakpoint by writing the original
-     contents back. */
-
-  read_memory (debug_addr, (char *) &debug_copy, sizeof (debug_copy));
-
-  /* Set `in_debugger' to zero now. */
-
-  write_memory (flag_addr, (char *) &in_debugger, sizeof (in_debugger));
-
-  breakpoint_addr = SOLIB_EXTRACT_ADDRESS (debug_copy.ldd_bp_addr);
-  write_memory (breakpoint_addr, (char *) &debug_copy.ldd_bp_inst,
-		sizeof (debug_copy.ldd_bp_inst));
-
-#else /* SVR4_SHARED_LIBS */
-
-  /* Note that breakpoint address and original contents are in our address
-     space, so we just need to write the original contents back. */
-
-  if (memory_remove_breakpoint (breakpoint_addr, shadow_contents) != 0)
-    {
-      status = 0;
-    }
-
-#endif /* !SVR4_SHARED_LIBS */
-
-  /* For the SVR4 version, we always know the breakpoint address.  For the
-     SunOS version we don't know it until the above code is executed.
-     Grumble if we are stopped anywhere besides the breakpoint address. */
-
-  if (stop_pc != breakpoint_addr)
-    {
-      warning ("stopped at unknown breakpoint while handling shared libraries");
-    }
-
-  return (status);
-}
-
-#endif /* #ifdef SVR4_SHARED_LIBS */
-
-/*
-
-   LOCAL FUNCTION
-
-   enable_break -- arrange for dynamic linker to hit breakpoint
-
-   SYNOPSIS
-
-   int enable_break (void)
-
-   DESCRIPTION
-
-   Both the SunOS and the SVR4 dynamic linkers have, as part of their
-   debugger interface, support for arranging for the inferior to hit
-   a breakpoint after mapping in the shared libraries.  This function
-   enables that breakpoint.
-
-   For SunOS, there is a special flag location (in_debugger) which we
-   set to 1.  When the dynamic linker sees this flag set, it will set
-   a breakpoint at a location known only to itself, after saving the
-   original contents of that place and the breakpoint address itself,
-   in it's own internal structures.  When we resume the inferior, it
-   will eventually take a SIGTRAP when it runs into the breakpoint.
-   We handle this (in a different place) by restoring the contents of
-   the breakpointed location (which is only known after it stops),
-   chasing around to locate the shared libraries that have been
-   loaded, then resuming.
-
-   For SVR4, the debugger interface structure contains a member (r_brk)
-   which is statically initialized at the time the shared library is
-   built, to the offset of a function (_r_debug_state) which is guaran-
-   teed to be called once before mapping in a library, and again when
-   the mapping is complete.  At the time we are examining this member,
-   it contains only the unrelocated offset of the function, so we have
-   to do our own relocation.  Later, when the dynamic linker actually
-   runs, it relocates r_brk to be the actual address of _r_debug_state().
-
-   The debugger interface structure also contains an enumeration which
-   is set to either RT_ADD or RT_DELETE prior to changing the mapping,
-   depending upon whether or not the library is being mapped or unmapped,
-   and then set to RT_CONSISTENT after the library is mapped/unmapped.
- */
-
-static int
-enable_break (void)
-{
-  int success = 0;
-
-#ifndef SVR4_SHARED_LIBS
-
-  int j;
-  int in_debugger;
-
-  /* Get link_dynamic structure */
-
-  j = target_read_memory (debug_base, (char *) &dynamic_copy,
-			  sizeof (dynamic_copy));
-  if (j)
-    {
-      /* unreadable */
-      return (0);
-    }
-
-  /* Calc address of debugger interface structure */
-
-  debug_addr = SOLIB_EXTRACT_ADDRESS (dynamic_copy.ldd);
-
-  /* Calc address of `in_debugger' member of debugger interface structure */
-
-  flag_addr = debug_addr + (CORE_ADDR) ((char *) &debug_copy.ldd_in_debugger -
-					(char *) &debug_copy);
-
-  /* Write a value of 1 to this member.  */
-
-  in_debugger = 1;
-  write_memory (flag_addr, (char *) &in_debugger, sizeof (in_debugger));
-  success = 1;
-
-#else /* SVR4_SHARED_LIBS */
-
-#ifdef BKPT_AT_SYMBOL
-
-  struct minimal_symbol *msymbol;
-  char **bkpt_namep;
-  asection *interp_sect;
-
-  /* First, remove all the solib event breakpoints.  Their addresses
-     may have changed since the last time we ran the program.  */
-  remove_solib_event_breakpoints ();
-
-#ifdef SVR4_SHARED_LIBS
-  interp_text_sect_low = interp_text_sect_high = 0;
-  interp_plt_sect_low = interp_plt_sect_high = 0;
-
-  /* Find the .interp section; if not found, warn the user and drop
-     into the old breakpoint at symbol code.  */
-  interp_sect = bfd_get_section_by_name (exec_bfd, ".interp");
-  if (interp_sect)
-    {
-      unsigned int interp_sect_size;
-      char *buf;
-      CORE_ADDR load_addr;
-      bfd *tmp_bfd;
-      CORE_ADDR sym_addr = 0;
-
-      /* Read the contents of the .interp section into a local buffer;
-         the contents specify the dynamic linker this program uses.  */
-      interp_sect_size = bfd_section_size (exec_bfd, interp_sect);
-      buf = alloca (interp_sect_size);
-      bfd_get_section_contents (exec_bfd, interp_sect,
-				buf, 0, interp_sect_size);
-
-      /* Now we need to figure out where the dynamic linker was
-         loaded so that we can load its symbols and place a breakpoint
-         in the dynamic linker itself.
-
-         This address is stored on the stack.  However, I've been unable
-         to find any magic formula to find it for Solaris (appears to
-         be trivial on GNU/Linux).  Therefore, we have to try an alternate
-         mechanism to find the dynamic linker's base address.  */
-      tmp_bfd = bfd_openr (buf, gnutarget);
-      if (tmp_bfd == NULL)
-	goto bkpt_at_symbol;
-
-      /* Make sure the dynamic linker's really a useful object.  */
-      if (!bfd_check_format (tmp_bfd, bfd_object))
-	{
-	  warning ("Unable to grok dynamic linker %s as an object file", buf);
-	  bfd_close (tmp_bfd);
-	  goto bkpt_at_symbol;
-	}
-
-      /* We find the dynamic linker's base address by examining the
-         current pc (which point at the entry point for the dynamic
-         linker) and subtracting the offset of the entry point.  */
-      load_addr = read_pc () - tmp_bfd->start_address;
-
-      /* Record the relocated start and end address of the dynamic linker
-         text and plt section for in_svr4_dynsym_resolve_code.  */
-      interp_sect = bfd_get_section_by_name (tmp_bfd, ".text");
-      if (interp_sect)
-	{
-	  interp_text_sect_low =
-	    bfd_section_vma (tmp_bfd, interp_sect) + load_addr;
-	  interp_text_sect_high =
-	    interp_text_sect_low + bfd_section_size (tmp_bfd, interp_sect);
-	}
-      interp_sect = bfd_get_section_by_name (tmp_bfd, ".plt");
-      if (interp_sect)
-	{
-	  interp_plt_sect_low =
-	    bfd_section_vma (tmp_bfd, interp_sect) + load_addr;
-	  interp_plt_sect_high =
-	    interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect);
-	}
-
-      /* Now try to set a breakpoint in the dynamic linker.  */
-      for (bkpt_namep = solib_break_names; *bkpt_namep != NULL; bkpt_namep++)
-	{
-	  sym_addr = bfd_lookup_symbol (tmp_bfd, *bkpt_namep);
-	  if (sym_addr != 0)
-	    break;
-	}
-
-      /* We're done with the temporary bfd.  */
-      bfd_close (tmp_bfd);
-
-      if (sym_addr != 0)
-	{
-	  create_solib_event_breakpoint (load_addr + sym_addr);
-	  return 1;
-	}
-
-      /* For whatever reason we couldn't set a breakpoint in the dynamic
-         linker.  Warn and drop into the old code.  */
-    bkpt_at_symbol:
-      warning ("Unable to find dynamic linker breakpoint function.\nGDB will be unable to debug shared library initializers\nand track explicitly loaded dynamic code.");
-    }
-#endif
-
-  /* Scan through the list of symbols, trying to look up the symbol and
-     set a breakpoint there.  Terminate loop when we/if we succeed. */
-
-  breakpoint_addr = 0;
-  for (bkpt_namep = bkpt_names; *bkpt_namep != NULL; bkpt_namep++)
-    {
-      msymbol = lookup_minimal_symbol (*bkpt_namep, NULL, symfile_objfile);
-      if ((msymbol != NULL) && (SYMBOL_VALUE_ADDRESS (msymbol) != 0))
-	{
-	  create_solib_event_breakpoint (SYMBOL_VALUE_ADDRESS (msymbol));
-	  return 1;
-	}
-    }
-
-  /* Nothing good happened.  */
-  success = 0;
-
-#endif /* BKPT_AT_SYMBOL */
-
-#endif /* !SVR4_SHARED_LIBS */
-
-  return (success);
-}
-
-/*
-
-   GLOBAL FUNCTION
+/* GLOBAL FUNCTION
 
    solib_create_inferior_hook -- shared library startup support
 
@@ -2086,172 +723,12 @@ enable_break (void)
    When gdb starts up the inferior, it nurses it along (through the
    shell) until it is ready to execute it's first instruction.  At this
    point, this function gets called via expansion of the macro
-   SOLIB_CREATE_INFERIOR_HOOK.
-
-   For SunOS executables, this first instruction is typically the
-   one at "_start", or a similar text label, regardless of whether
-   the executable is statically or dynamically linked.  The runtime
-   startup code takes care of dynamically linking in any shared
-   libraries, once gdb allows the inferior to continue.
-
-   For SVR4 executables, this first instruction is either the first
-   instruction in the dynamic linker (for dynamically linked
-   executables) or the instruction at "start" for statically linked
-   executables.  For dynamically linked executables, the system
-   first exec's /lib/libc.so.N, which contains the dynamic linker,
-   and starts it running.  The dynamic linker maps in any needed
-   shared libraries, maps in the actual user executable, and then
-   jumps to "start" in the user executable.
-
-   For both SunOS shared libraries, and SVR4 shared libraries, we
-   can arrange to cooperate with the dynamic linker to discover the
-   names of shared libraries that are dynamically linked, and the
-   base addresses to which they are linked.
-
-   This function is responsible for discovering those names and
-   addresses, and saving sufficient information about them to allow
-   their symbols to be read at a later time.
-
-   FIXME
-
-   Between enable_break() and disable_break(), this code does not
-   properly handle hitting breakpoints which the user might have
-   set in the startup code or in the dynamic linker itself.  Proper
-   handling will probably have to wait until the implementation is
-   changed to use the "breakpoint handler function" method.
-
-   Also, what if child has exit()ed?  Must exit loop somehow.
- */
+   SOLIB_CREATE_INFERIOR_HOOK.  */
 
 void
 solib_create_inferior_hook (void)
 {
-  /* If we are using the BKPT_AT_SYMBOL code, then we don't need the base
-     yet.  In fact, in the case of a SunOS4 executable being run on
-     Solaris, we can't get it yet.  current_sos will get it when it needs
-     it.  */
-#if !(defined (SVR4_SHARED_LIBS) && defined (BKPT_AT_SYMBOL))
-  if ((debug_base = locate_base ()) == 0)
-    {
-      /* Can't find the symbol or the executable is statically linked. */
-      return;
-    }
-#endif
-
-  if (!enable_break ())
-    {
-      warning ("shared library handler failed to enable breakpoint");
-      return;
-    }
-
-#if !defined(SVR4_SHARED_LIBS) || defined(_SCO_DS)
-  /* SCO and SunOS need the loop below, other systems should be using the
-     special shared library breakpoints and the shared library breakpoint
-     service routine.
-
-     Now run the target.  It will eventually hit the breakpoint, at
-     which point all of the libraries will have been mapped in and we
-     can go groveling around in the dynamic linker structures to find
-     out what we need to know about them. */
-
-  clear_proceed_status ();
-  stop_soon_quietly = 1;
-  stop_signal = TARGET_SIGNAL_0;
-  do
-    {
-      target_resume (-1, 0, stop_signal);
-      wait_for_inferior ();
-    }
-  while (stop_signal != TARGET_SIGNAL_TRAP);
-  stop_soon_quietly = 0;
-
-#if !defined(_SCO_DS)
-  /* We are now either at the "mapping complete" breakpoint (or somewhere
-     else, a condition we aren't prepared to deal with anyway), so adjust
-     the PC as necessary after a breakpoint, disable the breakpoint, and
-     add any shared libraries that were mapped in. */
-
-  if (DECR_PC_AFTER_BREAK)
-    {
-      stop_pc -= DECR_PC_AFTER_BREAK;
-      write_register (PC_REGNUM, stop_pc);
-    }
-
-  if (!disable_break ())
-    {
-      warning ("shared library handler failed to disable breakpoint");
-    }
-
-  if (auto_solib_add)
-    solib_add ((char *) 0, 0, (struct target_ops *) 0);
-#endif /* ! _SCO_DS */
-#endif
-}
-
-/*
-
-   LOCAL FUNCTION
-
-   special_symbol_handling -- additional shared library symbol handling
-
-   SYNOPSIS
-
-   void special_symbol_handling ()
-
-   DESCRIPTION
-
-   Once the symbols from a shared object have been loaded in the usual
-   way, we are called to do any system specific symbol handling that 
-   is needed.
-
-   For SunOS4, this consists of grunging around in the dynamic
-   linkers structures to find symbol definitions for "common" symbols
-   and adding them to the minimal symbol table for the runtime common
-   objfile.
-
- */
-
-static void
-special_symbol_handling (void)
-{
-#ifndef SVR4_SHARED_LIBS
-  int j;
-
-  if (debug_addr == 0)
-    {
-      /* Get link_dynamic structure */
-
-      j = target_read_memory (debug_base, (char *) &dynamic_copy,
-			      sizeof (dynamic_copy));
-      if (j)
-	{
-	  /* unreadable */
-	  return;
-	}
-
-      /* Calc address of debugger interface structure */
-      /* FIXME, this needs work for cross-debugging of core files
-         (byteorder, size, alignment, etc).  */
-
-      debug_addr = SOLIB_EXTRACT_ADDRESS (dynamic_copy.ldd);
-    }
-
-  /* Read the debugger structure from the inferior, just to make sure
-     we have a current copy. */
-
-  j = target_read_memory (debug_addr, (char *) &debug_copy,
-			  sizeof (debug_copy));
-  if (j)
-    return;			/* unreadable */
-
-  /* Get common symbol definitions for the loaded object. */
-
-  if (debug_copy.ldd_cp)
-    {
-      solib_add_common_symbols (SOLIB_EXTRACT_ADDRESS (debug_copy.ldd_cp));
-    }
-
-#endif /* !SVR4_SHARED_LIBS */
+  TARGET_SO_SOLIB_CREATE_INFERIOR_HOOK ();
 }
 
 
@@ -2276,13 +753,10 @@ sharedlibrary_command (char *args, int from_tty)
   solib_add (args, from_tty, (struct target_ops *) 0);
 }
 
-#endif /* HAVE_LINK_H */
 
 void
 _initialize_solib (void)
 {
-#ifdef HAVE_LINK_H
-
   add_com ("sharedlibrary", class_files, sharedlibrary_command,
 	   "Load shared object library symbols for files matching REGEXP.");
   add_info ("sharedlibrary", info_sharedlibrary_command,
@@ -2314,5 +788,4 @@ This takes precedence over the environment variables PATH and LD_LIBRARY_PATH.",
 		  &setlist),
      &showlist);
 
-#endif /* HAVE_LINK_H */
 }
diff --git a/gdb/solist.h b/gdb/solist.h
new file mode 100644
index 00000000000..784ea1bed05
--- /dev/null
+++ b/gdb/solist.h
@@ -0,0 +1,91 @@
+/* Shared library declarations for GDB, the GNU Debugger.
+   Copyright 1990, 91, 92, 93, 94, 95, 96, 98, 1999, 2000
+   Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#define SO_NAME_MAX_PATH_SIZE 512	/* FIXME: Should be dynamic */
+
+/* Forward declaration for target specific link map information.  This
+   struct is opaque to all but the target specific file.  */
+struct lm_info;
+
+struct so_list
+  {
+    /* The following fields of the structure come directly from the
+       dynamic linker's tables in the inferior, and are initialized by
+       current_sos.  */
+
+    struct so_list *next;	/* next structure in linked list */
+
+    /* A pointer to target specific link map information.  Often this
+       will be a copy of struct link_map from the user process, but
+       it need not be; it can be any collection of data needed to
+       traverse the dynamic linker's data structures. */
+    struct lm_info *lm_info;
+
+    /* Shared object file name, exactly as it appears in the
+       inferior's link map.  This may be a relative path, or something
+       which needs to be looked up in LD_LIBRARY_PATH, etc.  We use it
+       to tell which entries in the inferior's dynamic linker's link
+       map we've already loaded.  */
+    char so_original_name[SO_NAME_MAX_PATH_SIZE];
+
+    /* shared object file name, expanded to something GDB can open */
+    char so_name[SO_NAME_MAX_PATH_SIZE];
+
+    /* The following fields of the structure are built from
+       information gathered from the shared object file itself, and
+       are initialized when we actually add it to our symbol tables.  */
+
+    bfd *abfd;
+    CORE_ADDR lmend;		/* upper addr bound of mapped object */
+    char symbols_loaded;	/* flag: symbols read in yet? */
+    char from_tty;		/* flag: print msgs? */
+    struct objfile *objfile;	/* objfile for loaded lib */
+    struct section_table *sections;
+    struct section_table *sections_end;
+    struct section_table *textsection;
+  };
+
+struct target_so_ops
+  {
+    CORE_ADDR (*lm_addr) (struct so_list *so);
+    void (*free_so) (struct so_list *so);
+    void (*clear_solib) (void);
+    void (*solib_create_inferior_hook) (void);
+    void (*special_symbol_handling) (void);
+    struct so_list *(*current_sos) (void);
+    int (*open_symbol_file_object) (void *from_ttyp);
+  };
+
+void free_so (struct so_list *so);
+
+/* FIXME: gdbarch needs to control this variable */
+extern struct target_so_ops *current_target_so_ops;
+
+#define TARGET_SO_LM_ADDR (current_target_so_ops->lm_addr)
+#define TARGET_SO_FREE_SO (current_target_so_ops->free_so)
+#define TARGET_SO_CLEAR_SOLIB (current_target_so_ops->clear_solib)
+#define TARGET_SO_SOLIB_CREATE_INFERIOR_HOOK \
+  (current_target_so_ops->solib_create_inferior_hook)
+#define TARGET_SO_SPECIAL_SYMBOL_HANDLING \
+  (current_target_so_ops->special_symbol_handling)
+#define TARGET_SO_CURRENT_SOS (current_target_so_ops->current_sos)
+#define TARGET_SO_OPEN_SYMBOL_FILE_OBJECT \
+  (current_target_so_ops->open_symbol_file_object)
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index cce7cc1ac34..31d7792ae64 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -33,15 +33,14 @@
 
 #ifdef	USE_PROC_FS
 #include <sys/procfs.h>
+/* Prototypes for supply_gregset etc. */
+#include "gregset.h"
 #endif
 
 #include "gdbcore.h"
 
 #include "symfile.h" 	/* for 'entry_point_address' */
 
-/* Prototypes for supply_gregset etc. */
-#include "gregset.h"
-
 /*
  * Some local macros that have multi-arch and non-multi-arch versions:
  */