diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3d1049466d6a61985db8d20d9c3696039d633730..f7182e4c0da351d066a741ce19dd1096b89f3bdc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* lib/target-supports.exp (check_function_available): Declare
+	function before calling.
+
 2006-10-30  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/29637
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 7776cb4f687d9deb3b31b055c45cce9257110ce9..99722474ff8c9dac6bb2c9324e2e9e949b7fe91a 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -936,6 +936,8 @@ proc check_function_available { function } {
 	set exe "function[pid].exe"
 
 	set f [open $src "w"]
+	puts $f "#ifdef __cplusplus\nextern \"C\"\n#endif\n"
+	puts $f "char $function ();\n"
 	puts $f "int main () { $function (); }"
 	close $f
 
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ce61055d8b723ea6cce5f5580a636d897ce2be10..9274108fdccef63b569e3e48eaf766a7f2afe0ee 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-30  Joseph Myers  <joseph@codesourcery.com>
+
+	* testsuite/config/default.exp (${tool}_target_compile): Use
+	v3_target_compile.
+
 2006-10-29  Paolo Carlini  <pcarlini@suse.de>
 
 	* src/debug.cc (_Safe_sequence_base::_M_revalidate_singular): Fix
diff --git a/libstdc++-v3/testsuite/config/default.exp b/libstdc++-v3/testsuite/config/default.exp
index 1c643f66f9a396a94af32df1f6ce7df0a3137648..c08f6dd61efcf777066521906820486e77883e02 100644
--- a/libstdc++-v3/testsuite/config/default.exp
+++ b/libstdc++-v3/testsuite/config/default.exp
@@ -28,6 +28,6 @@ load_lib "standard.exp"
 
 # target-supports.exp uses this
 proc ${tool}_target_compile { srcfile destfile compile_type options } {
-    target_compile $srcfile $destfile $compile_type $options
+    v3_target_compile $srcfile $destfile $compile_type $options
 }