From 71caddc5568f59a5990f39226f60979a7fe953ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Sun, 13 May 2012 11:10:49 +0000 Subject: optc-gen.awk: Error instead of warning for conflicting help. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2012-05-13 Manuel López-Ibáñez gcc/ * optc-gen.awk: Error instead of warning for conflicting help. ada/ * gcc-interface/lang.opt (I): Comment out help text with no effect. (nostdinc): Comment out help text with no effect. From-SVN: r187437 --- gcc/ChangeLog | 4 ++++ gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/lang.opt | 4 ++-- 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 + + * optc-gen.awk: Error instead of warning for conflicting help. + 2012-05-12 Jason Merrill 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 + + * 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 * 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 . Add to the end of the main source path +; Documented in C but it should be: -I . Add 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; -- cgit v1.1