gcc/testsuite:

	* lib/file-format.exp (gcc_target_object_format): Use remote_exec
	to call objdump.
	* lib/scanasm.exp (scan-assembler-dem, scan-assembler-dem-not):
	Use remote_exec to call c++filt.
	* lib/target-supports-dg.exp (dg-require-host-local): New.
	* gcc.misc-tests/options.exp: Allow .exe in command paths.
	* g++.dg/parse/repo1.C: Use dg-require-host-local.
	* g++.dg/rtti/repo1.C: Likewise.
	* g++.dg/template/repo1.C: Likewise.
	* g++.dg/template/repo2.C: Likewise.
	* g++.dg/template/repo3.C: Likewise.
	* g++.dg/template/repo4.C: Likewise.
	* g++.dg/template/repo5.C: Likewise.
	* g++.old-deja/g++.pt/instantiate4.C: Likewise.
	* g++.old-deja/g++.pt/instantiate6.C: Likewise.
	* g++.old-deja/g++.pt/repo1.C: Likewise.
	* g++.old-deja/g++.pt/repo2.C: Likewise.
	* g++.old-deja/g++.pt/repo3.C: Likewise.
	* g++.old-deja/g++.pt/repo4.C: Likewise.
	* gcc.dg/cpp/trad/builtins.c: Likewise.

libstdc++-v3:
	* testsuite/lib/libstdc++.exp (v3-build-support): Specify output
	file for preprocessing.  Use remote_exec to call ar and ranlib.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128283 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 16 insertions, 8 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0f653f7d897..3faf3ff83b0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-09  Joseph Myers  <joseph@codesourcery.com>
+
+	* testsuite/lib/libstdc++.exp (v3-build-support): Specify output
+	file for preprocessing.  Use remote_exec to call ar and ranlib.
+
 2007-09-08  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/functional_hash.h: Add ext/numeric_traits.h.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 70b588d20df..cc24fc9afbd 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -452,12 +452,15 @@ proc v3-build_support { } {
     set libtest_objs ""
 
     set config_src "config.cc"
+    set config_out "config.ii"
     set f [open $config_src "w"]
     puts $f "#include <bits/c++config.h>"
     puts $f "#include <bits/gthr.h>"
     close $f
-    set preprocessed [v3_target_compile $config_src "" \
-	    	       preprocess "additional_flags=-dN"]
+    v3_target_compile $config_src $config_out preprocess "additional_flags=-dN"
+    set file [open $config_out r]
+    set preprocessed [read $file]
+    close $file
     if { [string first "_GLIBCXX_USE_WCHAR_T" $preprocessed] != -1 } {
 	verbose -log "wchar_t support detected"
 	set v3-wchar_t 1
@@ -509,9 +512,9 @@ proc v3-build_support { } {
     } else {
 	set ar [transform "ar"]
     }
-    set arcommand "$ar -rc ./libtestc++.a ${libtest_objs}"
-    verbose -log "$arcommand"
-    set result [lindex [local_exec "$arcommand" "" "" 300] 0]
+    set arargs "-rc ./libtestc++.a ${libtest_objs}"
+    verbose -log "$ar $arargs"
+    set result [lindex [remote_exec host "$ar" "$arargs"] 0]
     verbose "link result is $result"
     if { $result == 0 } {
 	if  [info exists env(RANLIB)] {
@@ -519,9 +522,9 @@ proc v3-build_support { } {
 	} else {
 	    set ranlib [transform "ranlib"]
 	}
-	set ranlibcommand "$ranlib ./libtestc++.a"
-	verbose -log "$ranlibcommand"
-	set result [lindex [local_exec "$ranlibcommand" "" "" 300] 0]
+	set ranlibargs "./libtestc++.a"
+	verbose -log "$ranlib $ranlibargs"
+	set result [lindex [remote_exec host "$ranlib" "$ranlibargs"] 0]
 	if { $result != 0 } {
 	    error "could not link libtestc++.a"
 	}