* lib/gcc-dg.exp (dg-xfail-if): Fix the flags compared against.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92490 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ec14576..5f0074a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22  Janis Johnson  <janis187@us.ibm.com>
+
+       * lib/gcc-dg.exp (dg-xfail-if): Fix the flags compared against.
+
 2004-12-22  Jan Beulich  <jbeulich@novell.com>
 
        * gcc.dg/20040813-1.c: Skip for *-*-netware*.

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index a0162d2..1a08b35 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -426,19 +426,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
        }
+
+       # Any value in this variable was left over from an earlier test.
+       set compiler_flags ""
     }
 }