Fix debugging programs statically linked against the thread library.

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

diff --git a/gdb/remote-os9k.c b/gdb/remote-os9k.c
index 53ca13d2762da73d034b3a99998fd241ea2c160e..08e1d85f5242549c628a0e6374d6327710a2fed0 100644 (file)
--- a/gdb/remote-os9k.c
+++ b/gdb/remote-os9k.c
@@ -143,7 +143,7 @@ expect (char *string, int discard)
   if (sr_get_debug ())
     printf ("Expecting \"%s\"\n", string);
 
-  immediate_quit = 1;
+  immediate_quit++;
   while (1)
     {
       c = readchar (timeout);
@@ -153,7 +153,7 @@ expect (char *string, int discard)
        {
          if (*p == '\0')
            {
-             immediate_quit = 0;
+             immediate_quit--;
              if (sr_get_debug ())
                printf ("\nMatched\n");
              return;
@@ -818,14 +818,15 @@ rombug_read_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
   return len;
 }
 
-/* FIXME-someday!  merge these two.  */
+/* Transfer LEN bytes between GDB address MYADDR and target address
+   MEMADDR.  If WRITE is non-zero, transfer them to the target,
+   otherwise transfer them from the target.  TARGET is unused.
+
+   Returns the number of bytes transferred. */
+
 static int
-rombug_xfer_inferior_memory (memaddr, myaddr, len, write, target)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int write;
-     struct target_ops *target;        /* ignored */
+rombug_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+                            int write, struct target_ops *target)
 {
   if (write)
     return rombug_write_inferior_memory (memaddr, myaddr, len);