diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26827a61ee90..c5f9d51276d7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* lib/objc.exp (objc_target_compile): Check for -fgnu-runtime
+	in ${options} instead of [target_info name].
+	* lib/obj-c++.exp (objc_target_compile): Likewise.
+
 2005-08-13  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* objc.dg/stubify-2.m: Correct the name of the rtl dump file.
diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp
index 476016a7a154..c2a05ee91281 100644
--- a/gcc/testsuite/lib/obj-c++.exp
+++ b/gcc/testsuite/lib/obj-c++.exp
@@ -306,8 +306,8 @@ proc obj-c++_target_compile { source dest type options } {
 
     set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc.a]
     if { $libobjc_dir == ""} {
-      verbose "see if we have -fgnu-runtime in [target_info name]"
-      if [regexp ".*-fgnu-runtime.*" [target_info name]] {
+      verbose "see if we have -fgnu-runtime in options"
+      if [regexp ".*-fgnu-runtime.*" "${options}" ] {
         set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc-gnu.a]
       }
     }
diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index 9dbbc3c757d5..87ccdac60509 100644
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -159,8 +159,8 @@ proc objc_target_compile { source dest type options } {
 
     set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc.a]
     if { $libobjc_dir == ""} {
-      verbose "see if we have -fgnu-runtime in [target_info name]"
-      if [regexp ".*-fgnu-runtime.*" [target_info name]] {
+      verbose "see if we have -fgnu-runtime in options"
+      if [regexp ".*-fgnu-runtime.*" "${options}"] {
         set libobjc_dir [lookfor_file ${objcpath} libobjc/.libs/libobjc-gnu.a]
       }
     }