From: manu <manu@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 13 May 2012 11:10:49 +0000 (+0000)
Subject: 2012-05-13  Manuel López-Ibáñez  <manu@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4584d89f1a8d2b9798306191aedadca32c0b740c;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187437 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 305bd5c5819f..ead8962267bc 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 f46b5ae80014..2f623f9030e0 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 48392352ebdf..17e766e36c31 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 4dc97f9ca6a5..61dbe8ce2ac7 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;