Fix ia64-linux fortran common linking problem.

[deliverable/binutils-gdb.git] / gdb / remote-udi.c

diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index a741ef76a86b781ff82564d4a7c094e01d19ae73..0015e99483db5b32b413b72969a0688095fd2114 100644 (file)
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -1,5 +1,6 @@
 /* Remote debugging interface for AMD 29k interfaced via UDI, for GDB.
-   Copyright 1990, 1992, 1995, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1990, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Written by Daniel Mann.  Contributed by AMD.
 
    This file is part of GDB.
@@ -46,13 +47,14 @@
 #include "gdbcmd.h"
 #include "bfd.h"
 #include "gdbcore.h"           /* For download function */
+#include "regcache.h"
 
 /* access the register store directly, without going through
    the normal handler functions. This avoids an extra data copy.  */
 
 extern int stop_soon_quietly;  /* for wait_for_inferior */
 extern struct value *call_function_by_hand ();
-static void udi_resume (int pid, int step, enum target_signal sig);
+static void udi_resume (ptid_t ptid, int step, enum target_signal sig);
 static void udi_fetch_registers (int regno);
 static void udi_load (char *args, int from_tty);
 static void fetch_register (int regno);
@@ -146,7 +148,7 @@ udi_create_inferior (char *execfile, char *args, char **env)
       entry.Offset = 0;
     }
 
-  inferior_pid = 40000;
+  inferior_ptid = pid_to_ptid (40000);
 
   if (!entry.Offset)
     download (execfile, 0);
@@ -316,7 +318,7 @@ udi_close (                 /*FIXME: how is quitting used */
 
   /* Do not try to close udi_session_id again, later in the program.  */
   udi_session_id = -1;
-  inferior_pid = 0;
+  inferior_ptid = null_ptid;
 
   printf_filtered ("  Ending remote debugging\n");
 }
@@ -368,7 +370,7 @@ udi_detach (char *args, int from_tty)
   /* Don't try to UDIDisconnect it again in udi_close, which is called from
      pop_target.  */
   udi_session_id = -1;
-  inferior_pid = 0;
+  inferior_ptid = null_ptid;
 
   pop_target ();
 
@@ -381,7 +383,7 @@ udi_detach (char *args, int from_tty)
 ** Tell the remote machine to resume.  */
 
 static void
-udi_resume (int pid, int step, enum target_signal sig)
+udi_resume (ptid_t ptid, int step, enum target_signal sig)
 {
   UDIError tip_error;
   UDIUInt32 Steps = 1;
@@ -406,8 +408,8 @@ udi_resume (int pid, int step, enum target_signal sig)
 ** Wait until the remote machine stops, then return,
    storing status in STATUS just as `wait' would.  */
 
-static int
-udi_wait (int pid, struct target_waitstatus *status)
+static ptid_t
+udi_wait (int ptid_t, struct target_waitstatus *status)
 {
   UDIInt32 MaxTime;
   UDIPId PId;
@@ -582,7 +584,7 @@ udi_wait (int pid, struct target_waitstatus *status)
 
   timeout = old_timeout;       /* Restore original timeout value */
   immediate_quit = old_immediate_quit;
-  return inferior_pid;
+  return inferior_ptid;
 }
 
 #if 0
@@ -1010,7 +1012,7 @@ udi_kill (void)
   UDIStop ();
 
   udi_session_id = -1;
-  inferior_pid = 0;
+  inferior_ptid = null_ptid;
 
   if (from_tty)
     printf_unfiltered ("Target has been stopped.");
@@ -1030,7 +1032,7 @@ udi_kill (void)
 
   /* Do not try to close udi_session_id again, later in the program.  */
   udi_session_id = -1;
-  inferior_pid = 0;
+  inferior_ptid = null_ptid;
 }
 
 /*