libstdc++.exp: Use gcc wrapper.exp and call libstdc++_maybe_build_wrapper instead...

	* testsuite/lib/libstdc++.exp: Use gcc wrapper.exp and call
	libstdc++_maybe_build_wrapper instead of using local code.

From-SVN: r87452

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 83ad43020e81ae48c08155b713815652fc75bbe1..e75bb6894910e7700725dfe87386f1b726303b18 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-14  Hans-Peter Nilsson  <hp@bitrange.com>
+
+       * testsuite/lib/libstdc++.exp: Use gcc wrapper.exp and call
+       libstdc++_maybe_build_wrapper instead of using local code.
+
 2004-09-08  Benjamin Kosnik  <bkoz@redhat.com>
 
        * config/linker-map.gnu (GLIBCXX_3.4.3): New, adjust symbol exports.

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 4e0d86df74a00c0c2b02f0095e163cb60da8866e..0b3b82b887e6ae445bf2231e81dff0e7b2034b40 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -50,6 +50,7 @@ load_lib libgloss.exp
 load_gcc_lib target-supports.exp
 load_lib prune.exp
 load_lib dg-options.exp
+load_gcc_lib wrapper.exp
 
 # Useful for debugging.  Pass the name of a variable and the verbosity
 # threshold (number of -v's on the command line).
@@ -208,17 +209,7 @@ proc libstdc++_init { testfile } {
         }
     }
 
-    if { [target_info needs_status_wrapper]!=""} {
-      file delete ${objdir}/testglue.o;
-      set gluefile ${objdir}/testglue.o;
-      set result [build_wrapper $gluefile];
-      if { $result != "" } {
-          set gluefile [lindex $result 0];
-          set wrap_flags [lindex $result 1];
-      } else {
-          unset gluefile
-      }
-    }
+    libstdc++_maybe_build_wrapper "${objdir}/testglue.o"
 }
 
 # Callback from system dg-test.