*** empty log message ***

5 files changed, 42 insertions, 5 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 37789a0..0b3e1cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,18 @@
 Mon Apr 22 00:02:43 1991  Jim Kingdon  (kingdon at cygint.cygnus.com)
 
-	* Shared libaray/corefile changes from Peter Schauer:
+	* dbxread.c (end_psymtab): Initialize pst->symtab.
+
+	* core.c (core_open): Call ADD_SOLIB.
+
+	* tm-sparc.h: Include <sun4/reg.h> not <machine/reg.h>.
+	sparc-tdep.c: Don't include <machine/reg.h>.
+
+	* sun3-xdep.c [!TARGET_SUN3]: Just provide empty functions which
+	don't do anything.
+
+	* core.c (core_open): Add make_cleanup (pop_target, 0).
+
+	* Shared library/corefile changes from Peter Schauer:
 	core.c (core_close): Call CLEAR_SOLIB.
 	(core_open): Remove comment about "should deal with shared lib".
 	(core_xfer_memory): If we can't xfer the usual way, try the
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 0747698..e9a6c6f 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -2497,6 +2497,7 @@ end_psymtab (pst, include_list, num_includes, capping_symbol_offset,
 	    subpst->n_static_syms = 0;
 
       subpst->readin = 0;
+      subpst->symtab = 0;
       subpst->read_symtab = dbx_psymtab_to_symtab;
 
       subpst->next = partial_symtab_list;
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 2954497..5118fc3 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -37,7 +37,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <fcntl.h>
 
 #include <sys/ptrace.h>
-#include <machine/reg.h>
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/gdb/sun3-xdep.c b/gdb/sun3-xdep.c
index bf0739e..6090dc4 100644
--- a/gdb/sun3-xdep.c
+++ b/gdb/sun3-xdep.c
@@ -31,6 +31,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 extern int errno;
 
+#if defined (TARGET_SUN3)
+/* All of this stuff is only relevant if both host and target are sun3.  */
 void
 fetch_inferior_registers ()
 {
@@ -133,3 +135,26 @@ fetch_core_registers (core_reg_sect, core_reg_size, which)
       fprintf (stderr, "Couldn't read float regs from core file\n");
   }
 }
+#else /* Not sun3 target.  */
+/* These functions shouldn't be called when we're cross-debugging.  */
+
+void
+fetch_inferior_registers ()
+{
+}
+
+/* ARGSUSED */
+store_inferior_registers (regno)
+     int regno;
+{
+}
+
+/* ARGSUSED */
+void
+fetch_core_registers (core_reg_sect, core_reg_size, which)
+     char *core_reg_sect;
+     unsigned core_reg_size;
+     int which;
+{
+}
+#endif /* Not sun3 target.  */
diff --git a/gdb/tm-sparc.h b/gdb/tm-sparc.h
index b3316da..cbe411e 100644
--- a/gdb/tm-sparc.h
+++ b/gdb/tm-sparc.h
@@ -290,9 +290,9 @@ extern CORE_ADDR skip_prologue ();
 /* Describe the pointer in each stack frame to the previous stack frame
    (its caller).  */
 
-/* I don't know whether this will work for cross-debugging, even if you
-   do get the right reg.h.  */
-#include <machine/reg.h>
+/* If you're not compiling this on a sun, you'll have to get a copy
+   of <sun4/reg.h> (also known as <machine/reg.h>).  */
+#include <sun4/reg.h>
 
 #define GET_RWINDOW_REG(FRAME, REG) \
   (read_memory_integer ((CORE_ADDR)&((struct rwindow *)FRAME)->REG, 4))