From 90c609e51aab3794230d1eae447a9dac825d6a57 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Mon, 13 Sep 2004 22:03:02 +0000 Subject: [PATCH] libstdc++.exp: Use gcc wrapper.exp and call libstdc++_maybe_build_wrapper instead of using... * testsuite/lib/libstdc++.exp: Use gcc wrapper.exp and call libstdc++_maybe_build_wrapper instead of using local code. From-SVN: r87452 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 13 ++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 83ad43020e8..e75bb689491 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-09-14 Hans-Peter Nilsson + + * testsuite/lib/libstdc++.exp: Use gcc wrapper.exp and call + libstdc++_maybe_build_wrapper instead of using local code. + 2004-09-08 Benjamin Kosnik * 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 4e0d86df74a..0b3b82b887e 100644 --- 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. -- 2.30.2