objc.exp (objc_target_compile): Check for -fgnu-runtime in ${options} instead of...

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.

From-SVN: r103063

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26827a61ee902886267d2ac12e4422f345091512..c5f9d51276d7e0dfd9059a3a09fa337a46b451be 100644 (file)
--- 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 476016a7a15422f75d3173a3fbceb195774cf1c0..c2a05ee912817a5af1f68be8331125f4fb719c76 100644 (file)
--- 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 9dbbc3c757d5ba5a48ec2b8867a9f5eeaddef814..87ccdac60509f10ded25330e0fe602c0014ef6e1 100644 (file)
--- 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]
       }
     }