target-supports-dg.exp (check-flags): Include TOOL_OPTIONS in the list of compiler...

* lib/target-supports-dg.exp (check-flags): Include TOOL_OPTIONS in
the list of compiler flags; this causes those flags to be checked
for things like dg-skip-if.

From-SVN: r114597

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bb887b3cd89ddc677bbb376c144499b4ae3bd91f..55d6788198f811fbe591e0f54a4fe611d7a87b48 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13  Matthew Sachs  <msachs@apple.com>
+
+       * lib/target-supports-dg.exp (check-flags): Include TOOL_OPTIONS in
+       the list of compiler flags; this causes those flags to be checked
+       for things like dg-skip-if.
+
 2006-06-12  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        PR c++/27601

diff --git a/gcc/testsuite/lib/target-supports-dg.exp b/gcc/testsuite/lib/target-supports-dg.exp
index 128ed8fd93b53c52621a7813e89bbcaa3451d3ba..e8eac300e694ba5f5c5d304e20dafe171e522967 100644 (file)
--- a/gcc/testsuite/lib/target-supports-dg.exp
+++ b/gcc/testsuite/lib/target-supports-dg.exp
@@ -186,6 +186,7 @@ proc check_test_flags { args } {
 
 proc check-flags { args } {
     global compiler_flags
+    global TOOL_OPTIONS
     # These variables are from DejaGnu's dg-test.
     upvar dg-extra-tool-flags extra_tool_flags
     upvar tool_flags tool_flags
@@ -198,6 +199,8 @@ proc check-flags { args } {
     set compiler_flags " toolname "
     append compiler_flags $extra_tool_flags
     append compiler_flags $tool_flags
+    # If running a subset of the test suite, $TOOL_OPTIONS may not exist.
+    catch {append compiler_flags " $TOOL_OPTIONS "}
     set dest [target_info name]
     if [board_info $dest exists multilib_flags] {
        append compiler_flags "[board_info $dest multilib_flags] "