optc-gen.awk: Error instead of warning for conflicting help.

2012-05-13  Manuel López-Ibáñez  <manu@gcc.gnu.org>

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 305bd5c5819fec763f067a07f9db7d77a937aa71..ead8962267bc3017d88d6a67b8ba5c4a0427cd9a 100644 (file)
--- 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 f46b5ae80014c85dda778f08dac6ea81d21b389e..2f623f9030e079f5fbd7b9b34ac466e2d6ac4a31 100644 (file)
--- 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 48392352ebdf2f666cce7d8e80112d892d34eb61..17e766e36c31d907f52475ae1ddcc645e543720b 100644 (file)
--- 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 4dc97f9ca6a56c80477f6553ac0d86038c5c0d36..61dbe8ce2ac754723abaa3c084ea95510751dbe4 100644 (file)
--- 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;