diff options
author | Alexandre Oliva <oliva@adacore.com> | 2020-05-26 11:02:21 -0300 |
---|---|---|
committer | Alexandre Oliva <oliva@gnu.org> | 2020-05-26 11:02:21 -0300 |
commit | 6232d02b4fce4c67d39815aa8fb956e4b10a4e1b (patch) | |
tree | 10272b2b66191d25d85ed047c780df380714cacc /gcc/gcc.c | |
parent | 1d72079ba3a370d6751953312f0de76d1a1c555d (diff) | |
download | gcc-6232d02b4fce4c67d39815aa8fb956e4b10a4e1b.zip gcc-6232d02b4fce4c67d39815aa8fb956e4b10a4e1b.tar.gz gcc-6232d02b4fce4c67d39815aa8fb956e4b10a4e1b.tar.bz2 |
do not skip validation of switch after %<opt
After the patch that revamped dump and aux outputs, GCC compilation
drivers built without Ada would reject -d* options. Such options
would only be validated because of the %{d*} in Ada lang specs, though
other languages had it as well. Other languages had %< specs that had
to be there before %{d*} %:dumps(), while Ada was missing them.
Adding them to Ada brought the same problem to compilers that had Ada
enabled.
The reason validation failed was that they mishandled %< specs,
advancing past the beginning of the next spec, causing it not to be
handled. Since %{d*} appeared after an odd %<, it was thus ignored.
The logic of validate_switches originally skipped the closing brace
that matched the opening brace, but this shouldn't happen for %<.
Fixed by letting validate_switches know whether it is handling a
braced group or a single atom, and behaving accordingly.
gcc/ChangeLog:
* gcc.c (validate_switches): Add braced parameter. Adjust all
callers. Expected and skip trailing brace only if braced.
Return after handling one atom otherwise.
(DUMPS_OPTIONS): New.
(cpp_debug_options): Define in terms of it.
gcc/ada/ChangeLog:
* gcc-interface/lang-specs.h (ADA_DUMPS_OPTIONS): Define in
terms of DUMPS_OPTIONS. Replace occurrences of %{d*} %:dumps
with it.
Diffstat (limited to 'gcc/gcc.c')
-rw-r--r-- | gcc/gcc.c | 32 |
1 files changed, 23 insertions, 9 deletions
@@ -388,7 +388,7 @@ static void do_option_spec (const char *, const char *); static void do_self_spec (const char *); static const char *find_file (const char *); static int is_directory (const char *, bool); -static const char *validate_switches (const char *, bool); +static const char *validate_switches (const char *, bool, bool); static void validate_all_switches (void); static inline void validate_switches_from_spec (const char *, bool); static void give_switch (int, int); @@ -1176,9 +1176,16 @@ static const char *cpp_options = %{!fno-working-directory:-fworking-directory}}} %{O*}\ %{undef} %{save-temps*:-fpch-preprocess}"; +/* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. + + Make it easy for a language to override the argument for the + %:dumps specs function call. */ +#define DUMPS_OPTIONS(EXTS) \ + "%<dumpdir %<dumpbase %<dumpbase-ext %{d*} %:dumps(" EXTS ")" + /* This contains cpp options which are not passed when the preprocessor output will be used by another program. */ -static const char *cpp_debug_options = "%<dumpdir %<dumpbase %<dumpbase-ext %{d*} %:dumps()"; +static const char *cpp_debug_options = DUMPS_OPTIONS (""); /* NB: This is shared amongst all front-ends, except for Ada. */ static const char *cc1_options = @@ -9061,7 +9068,7 @@ validate_switches_from_spec (const char *spec, bool user) || (*p == 'W' && *++p == '{') || (*p == '@' && *++p == '{'))) /* We have a switch spec. */ - p = validate_switches (p + 1, user); + p = validate_switches (p + 1, user, *p == '{'); } static void @@ -9080,11 +9087,15 @@ validate_all_switches (void) validate_switches_from_spec (link_command_spec, false); } -/* Look at the switch-name that comes after START - and mark as valid all supplied switches that match it. */ +/* Look at the switch-name that comes after START and mark as valid + all supplied switches that match it. If BRACED, handle other + switches after '|' and '&', and specs after ':' until ';' or '}', + going back for more switches after ';'. Without BRACED, handle + only one atom. Return a pointer to whatever follows the handled + items, after the closing brace if BRACED. */ static const char * -validate_switches (const char *start, bool user_spec) +validate_switches (const char *start, bool user_spec, bool braced) { const char *p = start; const char *atom; @@ -9126,6 +9137,9 @@ next_member: switches[i].validated = true; } + if (!braced) + return p; + if (*p) p++; if (*p && (p[-1] == '|' || p[-1] == '&')) goto next_member; @@ -9138,11 +9152,11 @@ next_member: { p++; if (*p == '{' || *p == '<') - p = validate_switches (p+1, user_spec); + p = validate_switches (p+1, user_spec, *p == '{'); else if (p[0] == 'W' && p[1] == '{') - p = validate_switches (p+2, user_spec); + p = validate_switches (p+2, user_spec, true); else if (p[0] == '@' && p[1] == '{') - p = validate_switches (p+2, user_spec); + p = validate_switches (p+2, user_spec, true); } else p++; |