diff --git a/gdb/remote-os9k.c b/gdb/remote-os9k.c
index 798e2ebf7e..cf4cd9b7d3 100644
--- a/gdb/remote-os9k.c
+++ b/gdb/remote-os9k.c
@@ -1015,7 +1015,7 @@ rombug_command (args, fromtty)
     error("Missing command.");
 	
   printf_monitor("%s\r", args);
-  expect(CMD_DELIM, 0);
+  expect_prompt(0);
 }
 
 #if 0
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index a1b1775af8..cc0a7fea41 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -2455,6 +2455,7 @@ read_struct_fields (fip, pp, type, objfile)
 
   while (**pp != ';')
     {
+      if (os9k_stabs && **pp == ',') break;
       STABS_CONTINUE (pp);
       /* Get space to record the next field's data.  */
       new = (struct nextfield *) xmalloc (sizeof (struct nextfield));