* lib/target-supports.exp (current_target_name): New.

[pf3gnuchains/gcc-fork.git] / gcc / testsuite / lib / gcc-dg.exp

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index a0162d2..9e1ea04 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+#   Copyright (C) 1997, 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -298,20 +298,6 @@ proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } {
     }
 }
 
-# Skip a test and clear all xfail flags that might have been set for it
-# by dg-xfail-if or for the xfail list in dg-do.  A procedure that calls
-# this must specify "upvar dg-do-what dg-do-what".
-
-proc skip_test_and_clear_xfail { } {
-    global compiler_conditional_xfail_data
-    upvar dg-do-what dg-do-what
-
-    set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
-    if [info exists compiler_conditional_xfail_data] {
-       unset compiler_conditional_xfail_data
-    }
-}
-
 # If this target does not support weak symbols, skip this test.
 
 proc dg-require-weak { args } {
@@ -322,7 +308,7 @@ proc dg-require-weak { args } {
     }
     if { $weak_available != 1 } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -337,7 +323,7 @@ proc dg-require-visibility { args } {
     }
     if { $visibility_available != 1 } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -352,7 +338,7 @@ proc dg-require-alias { args } {
     }
     if { $alias_available < 2 } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -362,7 +348,7 @@ proc dg-require-alias { args } {
 proc dg-require-gc-sections { args } {
     if { ![ check_gc_sections_available ] } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -371,7 +357,7 @@ proc dg-require-gc-sections { args } {
 proc dg-require-profiling { args } {
     if { ![ check_profiling_available ${args} ] } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+       set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -391,13 +377,13 @@ proc dg-require-dll { args } {
     }
 
     upvar dg-do-what dg-do-what
-    skip_test_and_clear_xfail
+    set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
 }
 
 proc dg-require-iconv { args } {
     if { ![ check_iconv_available ${args} ] } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+        set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -406,7 +392,7 @@ proc dg-require-iconv { args } {
 proc dg-require-named-sections { args } {
     if { ![ check_named_sections_available ] } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+        set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -416,7 +402,7 @@ proc dg-require-effective-target { args } {
     set args [lreplace $args 0 0]
     if { ![is-effective-target [lindex $args 0]] } {
        upvar dg-do-what dg-do-what
-       skip_test_and_clear_xfail
+        set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
     }
 }
 
@@ -426,19 +412,40 @@ proc dg-require-effective-target { args } {
 # The first argument is the line number of the dg-skip-if directive
 # within the test file.   Remaining arguments are as for xfail lists:
 # message { targets } { include } { exclude }
+#
+# This tests against multilib flags plus either the default flags for this
+# group of tests or flags specified with a previous dg-options command.
 
 proc dg-skip-if { args } {
     set args [lreplace $args 0 0]
 
-    # The target list might be an effective-target keyword, so replace
-    # the original list with "*-*-*" if it is matched.
     set selector "target [join [lindex $args 1]]"
     if { [dg-process-target $selector] == "S" } {
-       # The target list matched; now check the flags.
+       # The target list matched; now check the flags.  The DejaGnu proc
+       # check_conditional_xfail will look at the options in compiler_flags,
+       # so set that up for this test based on flags we know about.  Start
+       # the list with a dummy tool name so the list will match "*" if
+       # there are no flags.
+
+       global compiler_flags
+       upvar dg-extra-tool-flags extra_tool_flags
+
+       set compiler_flags " toolname "
+       append compiler_flags $extra_tool_flags
+       set dest [target_info name]
+       if [board_info $dest exists multilib_flags] {
+           append compiler_flags "[board_info $dest multilib_flags] "
+       }
+
+       # The target list might be an effective-target keyword, so replace
+       # the original list with "*-*-*".
        if [check_conditional_xfail [lreplace $args 1 1 "*-*-*"]] {
            upvar dg-do-what dg-do-what
-           skip_test_and_clear_xfail
+            set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
        }
+
+       # Any value in this variable was left over from an earlier test.
+       set compiler_flags ""
     }
 }
 
@@ -487,17 +494,24 @@ if { [info procs saved-dg-test] == [list] } {
        global additional_sources
        global additional_prunes
        global errorInfo
+       global compiler_conditional_xfail_data
 
        if { [ catch { eval saved-dg-test $args } errmsg ] } {
            set saved_info $errorInfo
            set additional_files ""
            set additional_sources ""
            set additional_prunes ""
+           if [info exists compiler_conditional_xfail_data] {
+               unset compiler_conditional_xfail_data
+           }
            error $errmsg $saved_info
        }
        set additional_files ""
        set additional_sources ""
        set additional_prunes ""
+       if [info exists compiler_conditional_xfail_data] {
+           unset compiler_conditional_xfail_data
+       }
     }
 }