From 7e654c3761e35773bcebb368865360855d24c73a Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sun, 22 Feb 2004 16:20:22 +0000
Subject: [PATCH] * amd64fbsd-tdep.c: Include "solib-svr4.h".
 (amd64fbsd_init_abi): Set link map offsets. * amd64nbsd-tdep.c: Include
 "slib-svr4.h". (amd64nbsd_init_abi): Set link map offsets. *
 amd64obsd-tdep.c: Include "solib-svr4.h". (amd64obsd_init_abi): Set link map
 offsets. * i386fbsd-tdep.c: Include "solib-svr4.h". (i386fbsd_init_abi): Set
 link map offsets. * i386nbsd-tdep.c: Include "solib-svr4.h".
 (i386nbsdelf_init_abi): Set link map offsets. * Makefile.in
 (amd64fbsd-tdep.o, amd64nbsd-tdep.o) (amd64obsd-tdep.o, i386fbsd-tdep.o):
 Update dependencies. * config/i386/fbsd.mh (NATDEPFILES): Remove solib.o,
 solib-svr4.o, solib-legacy.o and core-aout.o. Reformat. *
 config/i386/fbsd64.mh (NATDEPFILES): Remove solib.o, solib-svr4.o,
 solib-legacy.o.  Reformat. * config/i386/nbsdaout.mh (NATDEPFILES): Add
 solib.o.  Reformat. * config/i386/nbsdelf.mh: Reformat. *
 config/i386/nbsd64.mh (NATDEPFILES): Remove solib.o, solib-svr4.o,
 solib-legacy.o and corelow.o. * config/i386/obsd.mh, config/i386/obsdaout.mh:
 Reformat. * config/i386/obsd64.mh (NATDEPFILES): Remove solib.o,
 solib-svr4.o, solib-legacy.o and corelow.o.  Reformat. * config/i386/fbsd.mt
 (TDEPFILES): Add solib.o, solib-svr4.o. * config/i386/fbsd64.mt (TDEPFILES):
 Add solib.o, solib-svr4.o. (TM_FILE): Set to tm-fbsd.h. * config/i386/nbsd.mt
 (TDEPFILES): Reformat. * config/i386/nbsd64.mt (TDEPFILES): Add corelow.o,
 solib.o and solib-svr4.o. * config/i386/obsd.mt (TDEPFILES): Add corelow.o,
 solib.o and solib-svr4.o. (TM_FILE): Set to nm-nbsd.h. *
 config/i386/nm-fbsd.h: Update copyright year.  Tweak comments. Simplify
 shared library support.  Don't include "elf/common.h". (SVR4_SHARED_LIBS):
 Don't define. * config/i386/nm-fbsd64.h: Update copyright year.  Don't
 include "solib.h". * config/i386/nm-nbsd.h, config/i386/nm-nbsdaout.h,
 config/i386/nm-obsd.h: Update copyright year.  Tweak comments. *
 config/i386/tm-fbsd.h: Update copyright tear.  Tweak comments. Don't include
 "i386/tm-i386.h".  Include "solib.h". * config/i386/tm-nbsd.h: Update
 copyright year.  Tweak comments. Don't include "i386/tm-i386.h". *
 config/i386/xm-i386.h: Update copyright year.  Tweak comments. *
 config/i386/xm-nbsd.h: Update copyright year.  Tweak comments. Include
 "i386/xm-i386.h". (HOST_LONG_DOUBLE_FORMAT): Remove.

---
 gdb/ChangeLog                 | 48 +++++++++++++++++++++++++++++++++++
 gdb/amd64fbsd-tdep.c          |  5 ++++
 gdb/amd64nbsd-tdep.c          |  8 ++++--
 gdb/amd64obsd-tdep.c          |  5 ++++
 gdb/config/i386/fbsd.mh       | 10 +++-----
 gdb/config/i386/fbsd.mt       |  5 ++--
 gdb/config/i386/fbsd64.mh     |  8 +++---
 gdb/config/i386/fbsd64.mt     |  5 +++-
 gdb/config/i386/nbsd.mt       |  6 ++---
 gdb/config/i386/nbsd64.mh     |  8 +++---
 gdb/config/i386/nbsd64.mt     |  4 ++-
 gdb/config/i386/nbsdaout.mh   |  8 +++---
 gdb/config/i386/nbsdelf.mh    |  4 +--
 gdb/config/i386/nm-fbsd.h     | 23 +++++------------
 gdb/config/i386/nm-fbsd64.h   |  9 ++-----
 gdb/config/i386/nm-nbsd.h     |  9 ++++---
 gdb/config/i386/nm-nbsdaout.h |  9 ++++---
 gdb/config/i386/nm-obsd.h     |  8 +++---
 gdb/config/i386/obsd.mh       |  6 ++---
 gdb/config/i386/obsd.mt       |  4 +--
 gdb/config/i386/obsd64.mh     |  8 +++---
 gdb/config/i386/obsd64.mt     |  4 ++-
 gdb/config/i386/obsdaout.mh   |  6 ++---
 gdb/config/i386/tm-fbsd.h     |  7 ++---
 gdb/config/i386/tm-nbsd.h     |  8 +++---
 gdb/config/i386/xm-i386.h     |  7 ++---
 gdb/config/i386/xm-nbsd.h     | 11 ++++----
 gdb/i386fbsd-tdep.c           |  7 +++--
 gdb/i386nbsd-tdep.c           | 10 ++++----
 29 files changed, 156 insertions(+), 104 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d077e074e9..5a99119ef6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,53 @@
 2004-02-22  Mark Kettenis  <kettenis@gnu.org>
 
+	* amd64fbsd-tdep.c: Include "solib-svr4.h".
+	(amd64fbsd_init_abi): Set link map offsets.
+	* amd64nbsd-tdep.c: Include "slib-svr4.h".
+	(amd64nbsd_init_abi): Set link map offsets.
+	* amd64obsd-tdep.c: Include "solib-svr4.h".
+	(amd64obsd_init_abi): Set link map offsets.
+	* i386fbsd-tdep.c: Include "solib-svr4.h".
+	(i386fbsd_init_abi): Set link map offsets.
+	* i386nbsd-tdep.c: Include "solib-svr4.h".
+	(i386nbsdelf_init_abi): Set link map offsets.
+	* Makefile.in (amd64fbsd-tdep.o, amd64nbsd-tdep.o)
+	(amd64obsd-tdep.o, i386fbsd-tdep.o): Update dependencies.
+	* config/i386/fbsd.mh (NATDEPFILES): Remove solib.o, solib-svr4.o,
+	solib-legacy.o and core-aout.o. Reformat.
+	* config/i386/fbsd64.mh (NATDEPFILES): Remove solib.o,
+	solib-svr4.o, solib-legacy.o.  Reformat.
+	* config/i386/nbsdaout.mh (NATDEPFILES): Add solib.o.  Reformat.
+	* config/i386/nbsdelf.mh: Reformat.
+	* config/i386/nbsd64.mh (NATDEPFILES): Remove solib.o,
+	solib-svr4.o, solib-legacy.o and corelow.o.
+	* config/i386/obsd.mh, config/i386/obsdaout.mh: Reformat.
+	* config/i386/obsd64.mh (NATDEPFILES): Remove solib.o,
+	solib-svr4.o, solib-legacy.o and corelow.o.  Reformat.
+	* config/i386/fbsd.mt (TDEPFILES): Add solib.o, solib-svr4.o.
+	* config/i386/fbsd64.mt (TDEPFILES): Add solib.o, solib-svr4.o.
+	(TM_FILE): Set to tm-fbsd.h.
+	* config/i386/nbsd.mt (TDEPFILES): Reformat.
+	* config/i386/nbsd64.mt (TDEPFILES): Add corelow.o, solib.o and
+	solib-svr4.o.
+	* config/i386/obsd.mt (TDEPFILES): Add corelow.o, solib.o and
+	solib-svr4.o.
+	(TM_FILE): Set to nm-nbsd.h.
+	* config/i386/nm-fbsd.h: Update copyright year.  Tweak comments.
+	Simplify shared library support.  Don't include "elf/common.h".
+	(SVR4_SHARED_LIBS): Don't define.
+	* config/i386/nm-fbsd64.h: Update copyright year.  Don't include
+	"solib.h".
+	* config/i386/nm-nbsd.h, config/i386/nm-nbsdaout.h,
+	config/i386/nm-obsd.h: Update copyright year.  Tweak comments.
+	* config/i386/tm-fbsd.h: Update copyright tear.  Tweak comments.
+	Don't include "i386/tm-i386.h".  Include "solib.h".
+	* config/i386/tm-nbsd.h: Update copyright year.  Tweak comments.
+	Don't include "i386/tm-i386.h".
+	* config/i386/xm-i386.h: Update copyright year.  Tweak comments.
+	* config/i386/xm-nbsd.h: Update copyright year.  Tweak comments.
+	Include "i386/xm-i386.h".
+	(HOST_LONG_DOUBLE_FORMAT): Remove.
+
 	Fix OpenBSD/i386 sigtramp recognition.
 	* i386-tdep.h: Update copyright year.
 	(i386bsd_pc_in_sigtramp, i386bsd_sigtramp_start)
diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index 6814dd97e9..3abdb0b616 100644
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -29,6 +29,7 @@
 #include "gdb_string.h"
 
 #include "x86-64-tdep.h"
+#include "solib-svr4.h"
 
 /* Support for signal handlers.  */
 
@@ -136,6 +137,10 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   tdep->sigcontext_addr = amd64fbsd_sigcontext_addr;
   tdep->sc_reg_offset = amd64fbsd_sc_reg_offset;
   tdep->sc_num_regs = ARRAY_SIZE (amd64fbsd_sc_reg_offset);
+
+  /* FreeBSD uses SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_lp64_fetch_link_map_offsets);
 }
 
 
diff --git a/gdb/amd64nbsd-tdep.c b/gdb/amd64nbsd-tdep.c
index a39c33e7c1..2a7181ae48 100644
--- a/gdb/amd64nbsd-tdep.c
+++ b/gdb/amd64nbsd-tdep.c
@@ -27,8 +27,9 @@
 
 #include "gdb_assert.h"
 
-#include "nbsd-tdep.h"
 #include "x86-64-tdep.h"
+#include "nbsd-tdep.h"
+#include "solib-svr4.h"
 
 /* Support for signal handlers.  */
 
@@ -98,6 +99,7 @@ amd64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   /* NetBSD has its own convention for signal trampolines.  */
   set_gdbarch_pc_in_sigtramp (gdbarch, nbsd_pc_in_sigtramp);
+  tdep->sigcontext_addr = amd64nbsd_sigcontext_addr;
 
   /* Initialize the array with register offsets in `struct
      sigcontext'.  This `struct sigcontext' has an sc_mcontext member
@@ -113,7 +115,9 @@ amd64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 	tdep->sc_reg_offset[i] = 32 + amd64nbsd_r_reg_offset[i];
     }
 
-  tdep->sigcontext_addr = amd64nbsd_sigcontext_addr;
+  /* NetBSD uses SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_lp64_fetch_link_map_offsets);
 }
 
 
diff --git a/gdb/amd64obsd-tdep.c b/gdb/amd64obsd-tdep.c
index f96eb5d281..86ece30292 100644
--- a/gdb/amd64obsd-tdep.c
+++ b/gdb/amd64obsd-tdep.c
@@ -31,6 +31,7 @@
 
 #include "x86-64-tdep.h"
 #include "i387-tdep.h"
+#include "solib-svr4.h"
 
 /* Support for core dumps.  */
 
@@ -198,6 +199,10 @@ amd64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   tdep->sigcontext_addr = amd64obsd_sigcontext_addr;
   tdep->sc_reg_offset = amd64obsd_sc_reg_offset;
   tdep->sc_num_regs = ARRAY_SIZE (amd64obsd_sc_reg_offset);
+
+  /* OpenBSD uses SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_lp64_fetch_link_map_offsets);
 }
 
 
diff --git a/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh
index 4c70fc6205..2d0500e565 100644
--- a/gdb/config/i386/fbsd.mh
+++ b/gdb/config/i386/fbsd.mh
@@ -1,7 +1,5 @@
-# Host: Intel 386 running FreeBSD
-
-XM_FILE= xm-i386.h
-
+# Host: FreeBSD/i386
+NATDEPFILES= fork-child.o infptrace.o inftarg.o \
+	i386-nat.o i386bsd-nat.o i386fbsd-nat.o gcore.o fbsd-proc.o
 NAT_FILE= nm-fbsd.h
-# NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make.
-NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o core-aout.o i386-nat.o i386bsd-nat.o i386fbsd-nat.o gcore.o fbsd-proc.o
+XM_FILE= xm-i386.h
diff --git a/gdb/config/i386/fbsd.mt b/gdb/config/i386/fbsd.mt
index b266255d51..be095e987a 100644
--- a/gdb/config/i386/fbsd.mt
+++ b/gdb/config/i386/fbsd.mt
@@ -1,3 +1,4 @@
-# Target: Intel 386 running FreeBSD
-TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o corelow.o
+# Target: FreeBSD/i386
+TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
+	corelow.o solib.o solib-svr4.o
 TM_FILE= tm-fbsd.h
diff --git a/gdb/config/i386/fbsd64.mh b/gdb/config/i386/fbsd64.mh
index eaa801fc23..6c30e3072d 100644
--- a/gdb/config/i386/fbsd64.mh
+++ b/gdb/config/i386/fbsd64.mh
@@ -1,7 +1,5 @@
 # Host: FreeBSD/amd64
-
-XM_FILE= xm-i386.h
-
+NATDEPFILES= fork-child.o infptrace.o inftarg.o \
+	amd64-nat.o amd64bsd-nat.o amd64fbsd-nat.o gcore.o fbsd-proc.o
 NAT_FILE= nm-fbsd64.h
-# NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make.
-NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o amd64-nat.o amd64bsd-nat.o amd64fbsd-nat.o gcore.o fbsd-proc.o
+XM_FILE= xm-i386.h
diff --git a/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt
index 3a66a15028..4f8501ef82 100644
--- a/gdb/config/i386/fbsd64.mt
+++ b/gdb/config/i386/fbsd64.mt
@@ -1,2 +1,5 @@
 # Target: FreeBSD/amd64
-TDEPFILES= x86-64-tdep.o amd64fbsd-tdep.o i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o corelow.o
+TDEPFILES= x86-64-tdep.o amd64fbsd-tdep.o \
+	i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
+	corelow.o solib.o solib-svr4.o
+TM_FILE= tm-fbsd.h
diff --git a/gdb/config/i386/nbsd.mt b/gdb/config/i386/nbsd.mt
index f7f8cd6e70..d6699b54ec 100644
--- a/gdb/config/i386/nbsd.mt
+++ b/gdb/config/i386/nbsd.mt
@@ -1,4 +1,4 @@
-# Target: Intel 386 running NetBSD
-TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o corelow.o \
-	nbsd-tdep.o solib.o solib-svr4.o
+# Target: NetBSD/i386
+TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o nbsd-tdep.o \
+	corelow.o solib.o solib-svr4.o
 TM_FILE= tm-nbsd.h
diff --git a/gdb/config/i386/nbsd64.mh b/gdb/config/i386/nbsd64.mh
index 5acd1676bb..e10ae7a2be 100644
--- a/gdb/config/i386/nbsd64.mh
+++ b/gdb/config/i386/nbsd64.mh
@@ -1,7 +1,5 @@
 # Host: NetBSD/amd64
-
-XM_FILE= xm-i386.h
-
+NATDEPFILES= fork-child.o infptrace.o inftarg.o \
+	amd64-nat.o amd64bsd-nat.o amd64nbsd-nat.o
 NAT_FILE= nm-nbsd.h
-# NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make.
-NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o corelow.o amd64-nat.o amd64bsd-nat.o amd64nbsd-nat.o
+XM_FILE= xm-i386.h
diff --git a/gdb/config/i386/nbsd64.mt b/gdb/config/i386/nbsd64.mt
index 6d73660fba..9f2a1eb9cb 100644
--- a/gdb/config/i386/nbsd64.mt
+++ b/gdb/config/i386/nbsd64.mt
@@ -1,2 +1,4 @@
 # Target: NetBSD/amd64
-TDEPFILES= x86-64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o
+TDEPFILES= x86-64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \
+	corelow.o solib.o solib-svr4.o
+TM_FILE= tm-nbsd.h
diff --git a/gdb/config/i386/nbsdaout.mh b/gdb/config/i386/nbsdaout.mh
index 226c56cc44..98e69c4c97 100644
--- a/gdb/config/i386/nbsdaout.mh
+++ b/gdb/config/i386/nbsdaout.mh
@@ -1,5 +1,5 @@
-# Host: Intel 386 running NetBSD
-NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o solib-sunos.o
-
-XM_FILE= xm-nbsd.h
+# Host: NetBSD/i386 a.out
+NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o \
+	solib.o solib-sunos.o
 NAT_FILE= nm-nbsdaout.h
+XM_FILE= xm-nbsd.h
diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
index 7c27b02f3a..0d313ddac8 100644
--- a/gdb/config/i386/nbsdelf.mh
+++ b/gdb/config/i386/nbsdelf.mh
@@ -1,4 +1,4 @@
-# Host: Intel 386 running NetBSD
+# Host: NetBSD/i386 ELF
 NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o
-XM_FILE= xm-nbsd.h
 NAT_FILE= nm-nbsd.h
+XM_FILE= xm-nbsd.h
diff --git a/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h
index e47e9ef1a6..314e3a0f2f 100644
--- a/gdb/config/i386/nm-fbsd.h
+++ b/gdb/config/i386/nm-fbsd.h
@@ -1,5 +1,6 @@
 /* Native-dependent definitions for FreeBSD/i386.
-   Copyright 1986, 1987, 1989, 1992, 1994, 1996, 1997, 2000, 2001
+
+   Copyright 1986, 1987, 1989, 1992, 1994, 1996, 1997, 2000, 2001, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -87,20 +88,10 @@ extern CORE_ADDR register_u_addr (CORE_ADDR blockend, int regno);
 
 /* Shared library support.  */
 
-/* The FreeBSD <link.h> uses the same condition to distinguish ELF
-   from a.out.  ELF implies SVR4 shared libraries.  */
-#if (defined (FREEBSD_ELF) || defined (__ELF__)) && !defined (FREEBSD_AOUT)
-#define SVR4_SHARED_LIBS
-#endif
+#include "solib.h"
 
-#include "solib.h"		/* Support for shared libraries. */
-#ifdef SVR4_SHARED_LIBS
-#include "elf/common.h"		/* Additional ELF shared library info. */
-#endif
-
-#ifndef SVR4_SHARED_LIBS
-
-/* Make structure definitions match up with those expected in `solib.c'.  */
+/* Make structure definitions match up with those expected in
+   `solib-sunos.c'.  */
 
 #define link_object	sod
 #define lo_name		sod_name
@@ -154,6 +145,4 @@ extern CORE_ADDR register_u_addr (CORE_ADDR blockend, int regno);
 #define ld_un		d_un
 #define ld_2		d_sdt
 
-#endif /* !SVR4_SHARED_LIBS */
-
-#endif /* NM_FBSD_H */
+#endif /* nm-fbsd.h */
diff --git a/gdb/config/i386/nm-fbsd64.h b/gdb/config/i386/nm-fbsd64.h
index e5b66df15e..4c27aff6d7 100644
--- a/gdb/config/i386/nm-fbsd64.h
+++ b/gdb/config/i386/nm-fbsd64.h
@@ -1,6 +1,6 @@
 /* Native-dependent definitions for FreeBSD/amd64.
-   Copyright 2003
-   Free Software Foundation, Inc.
+
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -33,10 +33,5 @@
 
 /* We can attach and detach.  */
 #define ATTACH_DETACH
-
-
-/* Shared library support.  */
-
-#include "solib.h"
 
 #endif /* nm-fbsd64.h */
diff --git a/gdb/config/i386/nm-nbsd.h b/gdb/config/i386/nm-nbsd.h
index 2e5adb82b3..fef50f37bf 100644
--- a/gdb/config/i386/nm-nbsd.h
+++ b/gdb/config/i386/nm-nbsd.h
@@ -1,5 +1,6 @@
-/* Native-dependent definitions for Intel 386 running NetBSD, for GDB.
-   Copyright 1986, 1987, 1989, 1992, 1994, 2000, 2002
+/* Native-dependent definitions for NetBSD/i386.
+
+   Copyright 1986, 1987, 1989, 1992, 1994, 2000, 2002, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -22,7 +23,7 @@
 #ifndef NM_NBSD_H
 #define NM_NBSD_H
 
-/* Get generic NetBSD native definitions. */
+/* Get generic NetBSD native definitions.  */
 #include "config/nm-nbsd.h"
 
-#endif /* NM_NBSD_H */
+#endif /* nm-nbsd.h */
diff --git a/gdb/config/i386/nm-nbsdaout.h b/gdb/config/i386/nm-nbsdaout.h
index dc8aac961c..375a6a02d9 100644
--- a/gdb/config/i386/nm-nbsdaout.h
+++ b/gdb/config/i386/nm-nbsdaout.h
@@ -1,5 +1,6 @@
-/* Native-dependent definitions for Intel 386 running NetBSD, for GDB.
-   Copyright 1986, 1987, 1989, 1992, 1994, 1996, 2000
+/* Native-dependent definitions for NetBSD/i386 a.out.
+
+   Copyright 1986, 1987, 1989, 1992, 1994, 1996, 2000, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -24,7 +25,7 @@
 
 #include "i386/nm-nbsd.h"
 
-/* Get generic NetBSD a.out native definitions. */
+/* Get generic NetBSD a.out native definitions.  */
 #include "config/nm-nbsdaout.h"
 
-#endif /* NM_NBSDAOUT_H */
+#endif /* nm-nbsdaout.h */
diff --git a/gdb/config/i386/nm-obsd.h b/gdb/config/i386/nm-obsd.h
index 6113e14008..4d10b539d8 100644
--- a/gdb/config/i386/nm-obsd.h
+++ b/gdb/config/i386/nm-obsd.h
@@ -1,5 +1,6 @@
 /* Native-dependent definitions for OpenBSD/i386.
-   Copyright 2001 Free Software Foundation, Inc.
+
+   Copyright 2001, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -51,9 +52,10 @@ extern CORE_ADDR register_u_addr (CORE_ADDR blockend, int regno);
 
 /* Shared library support.  */
 
-#include "solib.h"		/* Support for shared libraries. */
+#include "solib.h"
 
-/* Make structure definitions match up with those expected in `solib.c'.  */
+/* Make structure definitions match up with those expected in
+   `solib-sunos.c'.  */
 
 #define link_object	sod
 #define lo_name		sod_name
diff --git a/gdb/config/i386/obsd.mh b/gdb/config/i386/obsd.mh
index 7a9d89e530..50a4fb7106 100644
--- a/gdb/config/i386/obsd.mh
+++ b/gdb/config/i386/obsd.mh
@@ -1,6 +1,4 @@
 # Host: OpenBSD/i386 ELF
-
-XM_FILE= xm-i386.h
-
-NAT_FILE= nm-obsd.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o i386obsd-nat.o
+NAT_FILE= nm-obsd.h
+XM_FILE= xm-i386.h
diff --git a/gdb/config/i386/obsd.mt b/gdb/config/i386/obsd.mt
index c49ae606c5..58e0fc0ebc 100644
--- a/gdb/config/i386/obsd.mt
+++ b/gdb/config/i386/obsd.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/i386
-TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o corelow.o \
-	solib.o solib-svr4.o
+TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
+	corelow.o solib.o solib-svr4.o
 TM_FILE= tm-nbsd.h
diff --git a/gdb/config/i386/obsd64.mh b/gdb/config/i386/obsd64.mh
index 9e196ad8b7..99ccfa2023 100644
--- a/gdb/config/i386/obsd64.mh
+++ b/gdb/config/i386/obsd64.mh
@@ -1,7 +1,5 @@
 # Host: OpenBSD/amd64
-
-XM_FILE= xm-i386.h
-
+NATDEPFILES= fork-child.o infptrace.o inftarg.o \
+	amd64-nat.o amd64bsd-nat.o amd64obsd-nat.o
 NAT_FILE= nm-nbsd.h
-# NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make.
-NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o corelow.o amd64-nat.o amd64bsd-nat.o amd64obsd-nat.o
+XM_FILE= xm-i386.h
diff --git a/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt
index 20a35d1ef9..0e6a38da07 100644
--- a/gdb/config/i386/obsd64.mt
+++ b/gdb/config/i386/obsd64.mt
@@ -1,3 +1,5 @@
 # Target: OpenBSD/amd64
 TDEPFILES= x86-64-tdep.o amd64obsd-tdep.o \
-	i386-tdep.o i387-tdep.o i386bsd-tdep.o
+	i386-tdep.o i387-tdep.o i386bsd-tdep.o \
+	corelow.o solib.o solib-svr4.o
+TM_FILE= tm-nbsd.h
diff --git a/gdb/config/i386/obsdaout.mh b/gdb/config/i386/obsdaout.mh
index 8ab548b3fc..3577178946 100644
--- a/gdb/config/i386/obsdaout.mh
+++ b/gdb/config/i386/obsdaout.mh
@@ -1,7 +1,5 @@
 # Host: OpenBSD/i386 a.out
-
-XM_FILE= xm-i386.h
-
-NAT_FILE= nm-obsd.h
 NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o i386obsd-nat.o \
 	solib.o solib-sunos.o
+NAT_FILE= nm-obsd.h
+XM_FILE= xm-i386.h
diff --git a/gdb/config/i386/tm-fbsd.h b/gdb/config/i386/tm-fbsd.h
index 433ef84938..98a2702175 100644
--- a/gdb/config/i386/tm-fbsd.h
+++ b/gdb/config/i386/tm-fbsd.h
@@ -1,5 +1,6 @@
 /* Target-dependent definitions for FreeBSD/i386.
-   Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright 1997, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,10 +22,10 @@
 #ifndef TM_FBSD_H
 #define TM_FBSD_H
 
-#include "i386/tm-i386.h"
+#include "solib.h"
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 
-#endif /* TM_FBSD_H */
+#endif /* tm-fbsd.h */
diff --git a/gdb/config/i386/tm-nbsd.h b/gdb/config/i386/tm-nbsd.h
index 8e58928132..8fd4158076 100644
--- a/gdb/config/i386/tm-nbsd.h
+++ b/gdb/config/i386/tm-nbsd.h
@@ -1,5 +1,6 @@
-/* Macro definitions for i386 running under NetBSD.
-   Copyright 1994, 1996, 2000, 2002 Free Software Foundation, Inc.
+/* Target-dependent definitions for NetBSD/i386.
+
+   Copyright 1994, 1996, 2000, 2002, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,7 +22,6 @@
 #ifndef TM_NBSD_H
 #define TM_NBSD_H
 
-#include "i386/tm-i386.h"
 #include "solib.h"
 
-#endif /* TM_NBSD_H */
+#endif /* tm-nbsd.h */
diff --git a/gdb/config/i386/xm-i386.h b/gdb/config/i386/xm-i386.h
index 151e7a6b55..de29b26599 100644
--- a/gdb/config/i386/xm-i386.h
+++ b/gdb/config/i386/xm-i386.h
@@ -1,5 +1,6 @@
-/* Host-dependent definitions for i386.
-   Copyright 2001 Free Software Foundation, Inc.
+/* Host-dependent definitions for the i386.
+
+   Copyright 2001, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -27,4 +28,4 @@
 #define HOST_DOUBLE_FORMAT &floatformat_ieee_double_little
 #define HOST_LONG_DOUBLE_FORMAT &floatformat_i387_ext
 
-#endif /* XM_386_H */
+#endif /* xm-i386.h */
diff --git a/gdb/config/i386/xm-nbsd.h b/gdb/config/i386/xm-nbsd.h
index 4a998cde4e..703c261ebe 100644
--- a/gdb/config/i386/xm-nbsd.h
+++ b/gdb/config/i386/xm-nbsd.h
@@ -1,5 +1,6 @@
-/* Parameters for execution on a i386 running NetBSD, for GDB.
-   Copyright 1994, 2000 Free Software Foundation, Inc.
+/* Host-dependent definitions for NetBSD/i386.
+
+   Copyright 1994, 2000, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* Get generic NetBSD host definitions. */
-#include "config/xm-nbsd.h"
+#include "i386/xm-i386.h"
 
-#define HOST_LONG_DOUBLE_FORMAT &floatformat_i387_ext
+/* Get generic NetBSD host definitions.  */
+#include "config/xm-nbsd.h"
diff --git a/gdb/i386fbsd-tdep.c b/gdb/i386fbsd-tdep.c
index 4cf8de8b45..db14a67a5b 100644
--- a/gdb/i386fbsd-tdep.c
+++ b/gdb/i386fbsd-tdep.c
@@ -25,6 +25,7 @@
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
+#include "solib-svr4.h"
 
 /* FreeBSD 3.0-RELEASE or later.  */
 
@@ -101,8 +102,10 @@ i386fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   i386_elf_init_abi (info, gdbarch);
 
   /* FreeBSD ELF uses SVR4-style shared libraries.  */
-  set_gdbarch_in_solib_call_trampoline (gdbarch,
-					generic_in_solib_call_trampoline);
+  set_gdbarch_in_solib_call_trampoline
+    (gdbarch, generic_in_solib_call_trampoline);
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 }
 
 /* FreeBSD 4.0-RELEASE or later.  */
diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
index a0609d55bd..82013b59fc 100644
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -1,6 +1,7 @@
 /* Target-dependent code for NetBSD/i386.
 
-   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002, 2003
+   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002,
+   2003, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -33,7 +34,6 @@
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 #include "nbsd-tdep.h"
-
 #include "solib-svr4.h"
 
 /* From <machine/reg.h>.  */
@@ -267,10 +267,10 @@ i386nbsdelf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   i386_elf_init_abi (info, gdbarch);
 
   /* NetBSD ELF uses SVR4-style shared libraries.  */
-  set_gdbarch_in_solib_call_trampoline (gdbarch,
-                                        generic_in_solib_call_trampoline);
+  set_gdbarch_in_solib_call_trampoline
+    (gdbarch, generic_in_solib_call_trampoline);
   set_solib_svr4_fetch_link_map_offsets
-    (gdbarch, nbsd_ilp32_solib_svr4_fetch_link_map_offsets);
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 
   /* NetBSD ELF uses -fpcc-struct-return by default.  */
   tdep->struct_return = pcc_struct_return;