diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d65af4108b9..5a9cf9f6bff 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-19  Ben Elliston  <bje@au.ibm.com>
+
+	* lib/target-supports.exp (check_effective_target_tls): Compile
+	test stubs using ${tool}_target_compile, not just target_compile.
+	(check_effective_target_tls_runtime): Likewise.
+
 2006-09-19  Ben Elliston  <bje@au.ibm.com>
 
 	* gcc.c-torture/compile/20030405-1.x: Remove.
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index bf8f7e796bb..90639ceb44f 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -390,6 +390,7 @@ proc check_effective_target_pcc_bitfield_type_matters { } {
 
 proc check_effective_target_tls {} {
     global et_tls_saved
+    global tool
 
     if [info exists et_tls_saved] {
 	verbose "check_effective_target_tls: using cached result" 2
@@ -406,7 +407,7 @@ proc check_effective_target_tls {} {
 
 	# Test for thread-local data supported by the platform.
 	set comp_output \
-	    [target_compile $src $asm assembly ""]
+	    [${tool}_target_compile $src $asm assembly ""]
 	file delete $src
 	if { [string match "*not supported*" $comp_output] } {
 	    set et_tls_saved 0
@@ -423,6 +424,7 @@ proc check_effective_target_tls {} {
 
 proc check_effective_target_tls_runtime {} {
     global et_tls_runtime_saved
+    global tool
 
     if [info exists et_tls_runtime_saved] {
 	verbose "check_effective_target_tls_runtime: using cached result" 2
@@ -439,7 +441,7 @@ proc check_effective_target_tls_runtime {} {
 	close $f
 
 	set comp_output \
-	    [target_compile $src $exe executable ""]
+	    [${tool}_target_compile $src $exe executable ""]
 	file delete $src
 
 	if [string match "" $comp_output] then {