backport: libstdc++.exp (v3-build_support): Delete libtestc++.a before creation.

	Backport from mainline:
	2010-12-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* testsuite/lib/libstdc++.exp (v3-build_support): Delete
	libtestc++.a before creation.

From-SVN: r167985

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e2ac9d3e0fcee70a3e0f9eaf31591636ee9a07f4..b75ad6434c1675699c2c7b285d99ee2b9ca024db 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline:
+       2010-12-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * testsuite/lib/libstdc++.exp (v3-build_support): Delete
+       libtestc++.a before creation.
+
 2010-12-16  Release Manager
 
        * GCC 4.5.2 released.

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 45a43dea5fd554cfc83ce0459a61caf81f0136be..e749d2236b09700ebd4b983a0ce88e3110bc6867 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -586,6 +586,15 @@ proc v3-build_support { } {
     }
 
     # Collect into libtestc++.a
+    # Delete libtestc++.a first.  Mixed 32 and 64-bit archives cannot be
+    # linked on IRIX 6.
+    # Use same procedure as gcc-dg.exp (remove-build-file).
+    if [is_remote host] {
+       # Ensure the host knows the file is gone by deleting there
+       # first.
+       remote_file host delete "./libtestc++.a"
+       }
+    remote_file build delete "./libtestc++.a"
     if  [info exists env(AR)] {
        set ar $env(AR)
     } else {