Fix unwind abort while compiling glibc, reported by HJ.

[deliverable/binutils-gdb.git] / gdb / standalone.c

diff --git a/gdb/standalone.c b/gdb/standalone.c
index 64f25bf1c12febc24ec876396ee60f85b156ac7a..906e37a2b6e0b5ca5a5ddd56146b2b573ac266c8 100644 (file)
--- a/gdb/standalone.c
+++ b/gdb/standalone.c
@@ -1,5 +1,7 @@
 /* Interface to bare machine for GDB running as kernel debugger.
-   Copyright (C) 1986, 1989, 1991 Free Software Foundation, Inc.
+
+   Copyright 1986, 1989, 1991, 1992, 1993, 1995, 1996, 2000, 2001,
+   2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -129,7 +131,7 @@ int sourcedesc;
 
 open (char *filename, int modes)
 {
-  register char *next;
+  char *next;
 
   if (modes)
     {
@@ -212,8 +214,8 @@ myread (int desc, char *destptr, int size, char *filename)
 int
 fread (int bufp, int numelts, int eltsize, int stream)
 {
-  register int elts = min (numelts, sourceleft / eltsize);
-  register int len = elts * eltsize;
+  int elts = min (numelts, sourceleft / eltsize);
+  int len = elts * eltsize;
 
   if (stream != sourcedesc)
     {
@@ -281,9 +283,9 @@ fprintf (int ign, int a1, int a2, int a3, int a4, int a5, int a6, int a7,
   display_string (buffer);
 }
 
-fwrite (register char *buf, int numelts, int size, int stream)
+fwrite (char *buf, int numelts, int size, int stream)
 {
-  register int i = numelts * size;
+  int i = numelts * size;
   while (i-- > 0)
     fputc (*buf++, stream);
 }
@@ -335,7 +337,7 @@ have_core_file_p (void)
 
 kill_command (void)
 {
-  inferior_pid = 0;
+  inferior_ptid = null_ptid;
 }
 
 terminal_inferior (void)
@@ -530,7 +532,7 @@ int
 wait (WAITTYPE *w)
 {
   WSETSTOP (*w, fault_table[fault_code / FAULT_CODE_UNITS]);
-  return inferior_pid;
+  return PIDGET (inferior_ptid);
 }
 \f
 /* Allocate a big space in which files for kdb to read will be stored.
@@ -559,7 +561,7 @@ int kdb_stack_end;
 
 _initialize_standalone (void)
 {
-  register char *next;
+  char *next;
 
   /* Find start of data on files.  */