2002-05-15 Nick Clifton <nickc@cambridge.redhat.com>

	* lib/gdb.exp (gdb_wrapper_init): Just because
	gdb_wrapper_file exists, this does not mean that the file
	should not be rebuilt.  That is what gdb_wrapper_initialized
	is for.
	(default_gdb_init): Reset gdb_wrapper_initialized.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 74359dde5b85ababbf63ca01d8e6c2ecf8f0d8b2..783d4ae03098a991976bb3427e7152b76899a8f3 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-15  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * lib/gdb.exp (gdb_wrapper_init): Just because
+       gdb_wrapper_file exists, this does not mean that the file
+       should not be rebuilt.  That is what gdb_wrapper_initialized
+       is for.
+       (default_gdb_init): Reset gdb_wrapper_initialized.
+
 2002-05-23  Michael Snyder  <msnyder@redhat.com>
 
        * gdb.base/all-bin.exp: Revise previous patch by just reducing 

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c41ed725473f2f004b3ae7885c00fc06382ff839..d9285e86945032c5ed5fbee4b9e0c3839e0e1082 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1119,8 +1119,7 @@ proc gdb_wrapper_init { args } {
     if { $gdb_wrapper_initialized == 1 } { return; }
 
     if {[target_info exists needs_status_wrapper] && \
-           [target_info needs_status_wrapper] != "0" && \
-           ![info exists gdb_wrapper_file]} {
+           [target_info needs_status_wrapper] != "0"} {
        set result [build_wrapper "testglue.o"];
        if { $result != "" } {
            set gdb_wrapper_file [lindex $result 0];
@@ -1390,8 +1389,14 @@ proc gdb_continue { function } {
 }
 
 proc default_gdb_init { args } {
+    global gdb_wrapper_initialized
+    
     gdb_clear_suppressed;
 
+    # Make sure that the wrapper is rebuilt
+    # with the appropriate multilib option.
+    set gdb_wrapper_initialized 0
+    
     # Uh, this is lame. Really, really, really lame. But there's this *one*
     # testcase that will fail in random places if we don't increase this.
     match_max -d 20000