+2000-11-22 Chris Demetriou <cgd@sibyte.com>
+2000-11-22 Neil Booth <neilb@earthling.net>
+
+ * gcc.c (validate_switches): Validate multiple switches named
+ in '|' (or) expressions in specs.
+ (handle_braces): If more than 1 alternative in a '|' spec
+ matches, call do_spec1 just once.
+
2000-11-22 Michael Meissner <meissner@redhat.com>
* d30v.h (TARGET_SWITCHES): Add documentation strings.
{
const char *filter, *body = NULL, *endbody = NULL;
int pipe_p = 0;
+ int true_once = 0; /* If, in %{a|b:d}, at least one of a,b was seen. */
int negate;
int suffix;
int include_blanks = 1;
give_switch (i, 0, include_blanks);
}
else
- {
- if (do_spec_1 (save_string (body, endbody - body - 1),
- 0, NULL_PTR) < 0)
- return 0;
- }
+ /* Even if many alternatives are matched, only output once. */
+ true_once = 1;
}
else if (pipe_p)
{
if (*p++ == '|')
goto next_member;
+ /* Process the spec just once, regardless of match count. */
+ if (true_once)
+ {
+ if (do_spec_1 (save_string (body, endbody - body - 1),
+ 0, NULL_PTR) < 0)
+ return 0;
+ }
+
return endbody;
}
\f
register const char *p = start;
const char *filter;
register int i;
- int suffix = 0;
+ int suffix;
if (*p == '|')
++p;
+next_member:
if (*p == '!')
++p;
+ suffix = 0;
if (*p == '.')
suffix = 1, ++p;
filter = p;
- while (*p != ':' && *p != '}')
+ while (*p != ':' && *p != '}' && *p != '|')
p++;
if (suffix)
else if (p[-1] == '*')
{
/* Mark all matching switches as valid. */
- --p;
for (i = 0; i < n_switches; i++)
- if (!strncmp (switches[i].part1, filter, p - filter))
+ if (!strncmp (switches[i].part1, filter, p - filter - 1))
switches[i].validated = 1;
}
else
switches[i].validated = 1;
}
}
+
+ if (*p++ == '|')
+ goto next_member;
}
\f
/* Check whether a particular argument was used. The first time we