* config/vx-gdb.exp (spawn_vxgdb): Use default_gdb_start instead

  of replicating gdb startup code.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e02ff568a85282f2d0425908c0e6f5330cf18d3a..562e1736828ba2471824986f3fbb63bf82aafdca 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 Wed Feb 15 14:23:28 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
+       * config/vx-gdb.exp (spawn_vxgdb): Use default_gdb_start instead
+         of replicating gdb startup code.
+
+       * config/mt-vxworks (LDFLAGS): Set to -r.
+         (CFLAGS_FOR_TARGET): Removed.
+
+       * config/vx-gdb.exp: always set prompt; gdb.exp sets it to
+         (gdb) and gdb for vxworks uses (vxgdb).
+
        * Makefile.in, gdb.{base,c++,chill}/Makefile.in (GDB): If a gdb
          executable is not in the tree and host != target, use sed and
          program_transform_name to determine the gdb name used by the

diff --git a/gdb/testsuite/config/vx-gdb.exp b/gdb/testsuite/config/vx-gdb.exp
index ce7b1a677e22e8c94c8b40928994b7d45e88ae92..001d51e388f73b24e7a7cda00a553ba140a67827 100644 (file)
--- a/gdb/testsuite/config/vx-gdb.exp
+++ b/gdb/testsuite/config/vx-gdb.exp
@@ -50,7 +50,7 @@ proc gdb_load { arg } {
     set result 0
 
     if [vxworks_ld $shell_id $arg]<0 then {
- perror "Couldn't load $arg"
+       perror "Couldn't load $arg"
        return -1
     }
 
@@ -61,9 +61,6 @@ proc gdb_load { arg } {
 # gdb_start -- start gdb running and 
 #
 proc gdb_start { } {
-    global GDB
-    global GDBFLAGS
-    global spawn_id
     global prompt
     global verbose
     global targetname
@@ -107,49 +104,12 @@ proc gdb_start { } {
 }
 
 proc spawn_vxgdb { } {
-    global GDB
-    global GDBFLAGS
-    global spawn_id
     global prompt
     global verbose
     global targetname
 
-    # start GDB
-    if [ llength $GDBFLAGS ] then {
-       if {[which $GDB] != 0} then {
-           spawn $GDB $GDBFLAGS
-       } else {
-            perror "$GDB does not exist."
-            exit 1
-        }
-    } else {
-        if {[which $GDB] != 0} then {
-           spawn $GDB
-        } else {
-            perror "$GDB does not exist."
-            exit 1
-        }
-    }
-    expect  {
-       -re ".*$prompt $" {
-           verbose "$GDB initialized for cross mode to Vxworks\n"
-       }
-       -re "$prompt $" {
-           perror "GDB never initialized."
-           return -1
-       }
-       timeout {
-           perror "(timeout) GDB never initialized."
-           return -1
-       }
-    }
+    default_gdb_start
 
-    # force the height to "unlimited", so no pagers get used
-    send "set height 0\n"
-    expect -re ".*$prompt $" {}
-    # force the width to "unlimited", so no wraparound occurs
-    send "set width 0\n"
-    expect -re ".*$prompt $" {}
     # set the default arguments to "main", so that "run" with no
     # arguments will work correctly.
     send "set args main\n"