Support both the generic remote protocol and the one for HP-PRO targets.

[binutils-gdb.git] / gdb / corelow.c

diff --git a/gdb/corelow.c b/gdb/corelow.c
index 77a4d17c2e1197357ea488f208506416e90821b7..ac1821563b5d3b7906a53b07394e6cb78062a456 100644 (file)
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -1,5 +1,6 @@
 /* Core dump and executable file functions below target vector, for GDB.
-   Copyright 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994
+   Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -18,6 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "defs.h"
+#include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -70,13 +72,14 @@ core_close (quitting)
 }
 
 #ifdef SOLIB_ADD
-/* Stub function for catch_errors around shared library hacking. */
+/* Stub function for catch_errors around shared library hacking.  FROM_TTYP
+   is really an int * which points to from_tty.  */
 
 static int 
-solib_add_stub (from_tty)
-     char *from_tty;
+solib_add_stub (from_ttyp)
+     char *from_ttyp;
 {
-    SOLIB_ADD (NULL, (int)from_tty, &core_ops);
+    SOLIB_ADD (NULL, *(int *)from_ttyp, &core_ops);
     return 0;
 }
 #endif /* SOLIB_ADD */
@@ -152,7 +155,7 @@ core_open (filename, from_tty)
     {
       /* Do it after the err msg */
       make_cleanup (bfd_close, temp_bfd);
-      error ("\"%s\" is not a core dump: %s", filename, bfd_errmsg(bfd_error));
+      error ("\"%s\" is not a core dump: %s", filename, bfd_errmsg(bfd_get_error ()));
     }
 
   /* Looks semi-reasonable.  Toss the old core file and work on the new.  */
@@ -168,7 +171,7 @@ core_open (filename, from_tty)
   if (build_section_table (core_bfd, &core_ops.to_sections,
                           &core_ops.to_sections_end))
     error ("Can't find sections in `%s': %s", bfd_get_filename(core_bfd),
-          bfd_errmsg (bfd_error));
+          bfd_errmsg (bfd_get_error ()));
 
   ontop = !push_target (&core_ops);
   discard_cleanups (old_chain);
@@ -194,7 +197,7 @@ core_open (filename, from_tty)
 
     /* Add symbols and section mappings for any shared libraries */
 #ifdef SOLIB_ADD
-    catch_errors (solib_add_stub, (char *)from_tty, (char *)0,
+    catch_errors (solib_add_stub, &from_tty, (char *)0,
                  RETURN_MASK_ALL);
 #endif
 
@@ -206,7 +209,7 @@ core_open (filename, from_tty)
   } else {
     warning (
 "you won't be able to access this core file until you terminate\n\
-your %s; do ``info files''", current_target->to_longname);
+your %s; do ``info files''", target_longname);
   }
 }
 
@@ -262,7 +265,7 @@ get_core_registers (regno)
     {
 cant:
       fprintf_filtered (gdb_stderr, "Couldn't fetch registers from core file: %s\n",
-              bfd_errmsg (bfd_error));
+              bfd_errmsg (bfd_get_error ()));
     }
 
   /* Now do it again for the float registers, if they exist.  */
@@ -279,7 +282,7 @@ cant:
     else
       {
        fprintf_filtered (gdb_stderr, "Couldn't fetch register set 2 from core file: %s\n",
-                bfd_errmsg (bfd_error));
+                bfd_errmsg (bfd_get_error ()));
       }
   }
   registers_fetched();