diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/lang.opt | 4 | ||||
| -rw-r--r-- | gcc/optc-gen.awk | 6 |
4 files changed, 14 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 305bd5c..ead8962 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-05-13 Manuel López-Ibáñez <manu@gcc.gnu.org> + + * optc-gen.awk: Error instead of warning for conflicting help. + 2012-05-12 Jason Merrill <jason@redhat.com> PR debug/53235 diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f46b5ae..2f623f90 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2012-05-13 Manuel López-Ibáñez <manu@gcc.gnu.org> + + * gcc-interface/lang.opt (I): Comment out help text with no effect. + (nostdinc): Comment out help text with no effect. + 2012-05-12 Eric Botcazou <ebotcazou@adacore.com> * gcc-interface/Makefile.in (TOOLS_LIBS): Add ../../ggc-none.o. diff --git a/gcc/ada/gcc-interface/lang.opt b/gcc/ada/gcc-interface/lang.opt index 4839235..17e766e 100644 --- a/gcc/ada/gcc-interface/lang.opt +++ b/gcc/ada/gcc-interface/lang.opt @@ -48,7 +48,7 @@ Ada AdaWhy Alias(nostdlib) I Ada AdaWhy Joined Separate --I <dir>. Add <dir> to the end of the main source path +; Documented in C but it should be: -I <dir>. Add <dir> to the end of the main source path Wall Ada AdaWhy @@ -60,7 +60,7 @@ Synonym of -gnatk8 nostdinc Ada AdaWhy RejectNegative -Do not look for source files in standard path +; Documented in C but it should be: Do not look for source files in standard path nostdlib Ada AdaWhy diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk index 4dc97f9..61dbe8c 100644 --- a/gcc/optc-gen.awk +++ b/gcc/optc-gen.awk @@ -188,9 +188,9 @@ for (i = 0; i < n_opts; i++) { if (help[i + 1] == "") help[i + 1] = help[i] else if (help[i] != "" && help[i + 1] != help[i]) - print "warning: multiple different help strings for " \ - opts[i] ":\n\t" help[i] "\n\t" help[i + 1] \ - | "cat 1>&2" + print "#error Multiple different help strings for " \ + opts[i] ":\n\t" help[i] "\n\t" help[i + 1] + i++; back_chain[i] = "N_OPTS"; indices[opts[i]] = j; |