driver: fix validate_switches logic

Under the old logic for validate_switches, once suffix or starred got set,
they stayed set for all later switches found in the spec.  So for e.g.

%{g*:%{%:debug-level-gt(0):

Once we see g*, starred is set.  Then we see %:, and it sees that as a
zero-length switch, which because starred is still set, matches any and all
command-line options.  So targets that use such a spec accept all options in
the driver, while ones that don't reject some, such as the recent
-nostdlib++.

This patch fixes the inconsistency, so all targets would complain about
-nostdlib++, and then sets SKIPOPT for it so they don't.

gcc/ChangeLog:

	* gcc.cc (validate_switches): Reset suffix/starred on loop.

gcc/cp/ChangeLog:

	* g++spec.cc (lang_specific_driver): Set SKIPOPT for nostdlib++.

diff --git a/gcc/cp/g++spec.cc b/gcc/cp/g++spec.cc
index e599ac9..3d3b042 100644 (file)
--- a/gcc/cp/g++spec.cc
+++ b/gcc/cp/g++spec.cc
@@ -167,8 +167,10 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
          need_experimental = true;
          break;
 
-       case OPT_nostdlib:
        case OPT_nostdlib__:
+         args[i] |= SKIPOPT;
+         /* FALLTHRU */
+       case OPT_nostdlib:
        case OPT_nodefaultlibs:
          library = -1;
          break;

diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index ca1c9e2..2278e2b 100644 (file)
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -9299,12 +9299,15 @@ validate_switches (const char *start, bool user_spec, bool braced)
   const char *atom;
   size_t len;
   int i;
-  bool suffix = false;
-  bool starred = false;
+  bool suffix;
+  bool starred;
 
 #define SKIP_WHITE() do { while (*p == ' ' || *p == '\t') p++; } while (0)
 
 next_member:
+  suffix = false;
+  starred = false;
+
   SKIP_WHITE ();
 
   if (*p == '!')