8 files changed, 24 insertions, 42 deletions
diff --git a/gdb/gdbserver/low-hppabsd.c b/gdb/gdbserver/low-hppabsd.c
index 7c1b660..de78ad5 100644
--- a/gdb/gdbserver/low-hppabsd.c
+++ b/gdb/gdbserver/low-hppabsd.c
@@ -369,13 +369,6 @@ write_inferior_memory (memaddr, myaddr, len)
 }
 
 void
-initialize ()
+initialize_low ()
 {
-  inferior_pid = 0;
-}
-
-int
-have_inferior_p ()
-{
-  return inferior_pid != 0;
 }
diff --git a/gdb/gdbserver/low-linux.c b/gdb/gdbserver/low-linux.c
index b9573b3..3b3e287 100644
--- a/gdb/gdbserver/low-linux.c
+++ b/gdb/gdbserver/low-linux.c
@@ -451,6 +451,15 @@ static int u_offsets[] =
     PT_F125,
     PT_F126,
     PT_F127,
+    /* predicate registers - we don't fetch these individually */
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
     /* branch registers */
     PT_B0,
     PT_B1,
@@ -460,6 +469,8 @@ static int u_offsets[] =
     PT_B5,
     PT_B6,
     PT_B7,
+    /* virtual frame pointer and virtual return address pointer */
+    -1, -1,
     /* other registers */
     PT_PR,
     PT_CR_IIP,
@@ -735,14 +746,7 @@ write_inferior_memory (memaddr, myaddr, len)
 }
 
 void
-initialize ()
+initialize_low ()
 {
-  inferior_pid = 0;
   initialize_arch();
 }
-
-int
-have_inferior_p ()
-{
-  return inferior_pid != 0;
-}
diff --git a/gdb/gdbserver/low-lynx.c b/gdb/gdbserver/low-lynx.c
index 75e11ba..6669565 100644
--- a/gdb/gdbserver/low-lynx.c
+++ b/gdb/gdbserver/low-lynx.c
@@ -746,3 +746,8 @@ ptrace (PTRACE_POKETEXT): errno=%d, pid=0x%x, addr=0x%x, buffer[i] = 0x%x\n",
 
   return 0;
 }
+
+void
+initialize_low ()
+{
+}
diff --git a/gdb/gdbserver/low-sim.c b/gdb/gdbserver/low-sim.c
index 3f9dea2..8d7c2e6 100644
--- a/gdb/gdbserver/low-sim.c
+++ b/gdb/gdbserver/low-sim.c
@@ -276,16 +276,7 @@ write_inferior_memory (memaddr, myaddr, len)
   return 0;
 }
 
-#if 0
 void
-initialize ()
-{
-  inferior_pid = 0;
-}
-
-int
-have_inferior_p ()
+initialize_low ()
 {
-  return inferior_pid != 0;
 }
-#endif
diff --git a/gdb/gdbserver/low-sparc.c b/gdb/gdbserver/low-sparc.c
index e0e635e..178afc7 100644
--- a/gdb/gdbserver/low-sparc.c
+++ b/gdb/gdbserver/low-sparc.c
@@ -324,13 +324,6 @@ write_inferior_memory (memaddr, myaddr, len)
 }
 
 void
-initialize ()
+initialize_low ()
 {
-  inferior_pid = 0;
-}
-
-int
-have_inferior_p ()
-{
-  return inferior_pid != 0;
 }
diff --git a/gdb/gdbserver/low-sun3.c b/gdb/gdbserver/low-sun3.c
index 786770b..71a151e 100644
--- a/gdb/gdbserver/low-sun3.c
+++ b/gdb/gdbserver/low-sun3.c
@@ -303,13 +303,6 @@ write_inferior_memory (memaddr, myaddr, len)
 }
 
 void
-initialize ()
+initialize_low ()
 {
-  inferior_pid = 0;
-}
-
-int
-have_inferior_p ()
-{
-  return inferior_pid != 0;
 }
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 8b18f53..48a7e0f 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -62,6 +62,8 @@ main (argc, argv)
   if (argc < 3)
     error ("Usage: gdbserver tty prog [args ...]");
 
+  initialize_low ();
+
   /* Wait till we are at first instruction in program.  */
   signal = start_inferior (&argv[2], &status);
 
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index c42a65c..21e4d68 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -33,6 +33,7 @@ unsigned char mywait PARAMS ((char *status));
 void read_inferior_memory PARAMS ((CORE_ADDR memaddr, char *myaddr, int len));
 int write_inferior_memory PARAMS ((CORE_ADDR memaddr, char *myaddr, int len));
 int create_inferior ();
+void initialize_low ();
 
 /* Target-specific variables */