diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2022-03-30 22:22:49 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2022-03-31 20:29:35 +0200 |
commit | 6c0e2645933449461d44fd2dce4fedf94199838c (patch) | |
tree | ef86efafef010596166dba71235300833f9e4609 /gcc | |
parent | 562d014efadfef6628ae670049c2d92ff6b166f0 (diff) | |
download | gcc-6c0e2645933449461d44fd2dce4fedf94199838c.zip gcc-6c0e2645933449461d44fd2dce4fedf94199838c.tar.gz gcc-6c0e2645933449461d44fd2dce4fedf94199838c.tar.bz2 |
options: Fix "Multiple different help strings" error diagnostic
This currently causes a confusing litany, for example:
options.cc:3245:2: error: #error Multiple different help strings for Wunused-result:
#error Multiple different help strings for Wunused-result:
^
options.cc:3246:2: error: 'Warn' was not declared in this scope
Warn if a caller of a function, marked with attribute warn_unused_result, does not use its return value.
^
options.cc:3246:7: error: expected '}' before 'if'
Warn if a caller of a function, marked with attribute warn_unused_result, does not use its return value.
^
options.cc:3246:7: error: expected ',' or ';' before 'if'
options.cc:3256:54: error: expected unqualified-id before ',' token
(unsigned short) -1, 0, CLVC_INTEGER, 0, -1, -1 },
^
[going on for several thousands of lines]
Fixed:
options.cc:3245:2: error: #error Multiple different help strings for Wunused-result:
#error Multiple different help strings for Wunused-result:
^
options.cc:3246:2: error: #error Warn if a caller of a function, marked with attribute warn_unused_result, does not use its return value.
#error Warn if a caller of a function, marked with attribute warn_unused_result, does not use its return value.
^
options.cc:3247:2: error: #error TEST.
#error TEST.
^
Fix-up for r187437/commit 71caddc5568f59a5990f39226f60979a7fe953ef
"optc-gen.awk: Error instead of warning for conflicting help".
gcc/
* optc-gen.awk <END>: Fix "Multiple different help strings" error
diagnostic.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/optc-gen.awk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk index f2198b2..b51688d 100644 --- a/gcc/optc-gen.awk +++ b/gcc/optc-gen.awk @@ -316,9 +316,12 @@ for (i = 0; i < n_opts; i++) { flags[i + 1] = flags[i] " " flags[i + 1]; if (help[i + 1] == "") help[i + 1] = help[i] - else if (help[i] != "" && help[i + 1] != help[i]) + else if (help[i] != "" && help[i + 1] != help[i]) { print "#error Multiple different help strings for " \ - opts[i] ":\n\t" help[i] "\n\t" help[i + 1] + opts[i] ":" + print "#error " help[i] + print "#error " help[i + 1] + } i++; back_chain[i] = "N_OPTS"; |