gcc.c (C specs): Pass -f(no-)show-column to the preprocessor.

	* gcc.c (C specs): Pass -f(no-)show-column to the
          preprocessor.
	* ch/lang-specs.h, cp/lang-specs.h, f/lang-specs.h,
	objc/lang-specs.h: Likewise.

	* gcc.dg/cpp-redef-2.c, gcc.dg/cpp-tradwarn1.c,
	gcc.dg/cpp-unc.c: Add -fno-show-column to compiler options.

From-SVN: r32891

12 files changed, 31 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a0fca72..c19dc3e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-03  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* gcc.c (C specs): Pass -fno-show-column to the preprocessor.
+	* objc/lang-specs.h: Likewise.
+
 2000-04-03  Neil Booth  <NeilB@earthling.net>
 
 	* cppexp.c: wrap long lines.  New macros CPP_ICE, SYNTAX_ERROR
diff --git a/gcc/ch/lang-specs.h b/gcc/ch/lang-specs.h
index 1b377f5..f5bbd61 100644
--- a/gcc/ch/lang-specs.h
+++ b/gcc/ch/lang-specs.h
@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
         %{!no-gcc:-D__GNUCHILL__=%v1 -D__GNUC_MINOR__=%v2 -D__GNUC_PATCHLEVEL__=%v3}\
         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:-D__OPTIMIZE__} %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional} %{!undef:%{!ansi:%p} %P} %{trigraphs}\
+	%{fshow-column} %{fno-show-column}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{!E:%g.i}%{E:%W{o*}} \n",
    "%{!E:cc1chill %g.i %1 \
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index da0b96f..1a74fea 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-03  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* lang-specs.h: Pass -fno-show-column to the preprocessor.
+
 2000-03-30  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* rtti.c (class_hint_flags): Rename flags.
diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index c3a81b1..804a079 100644
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -78,6 +78,7 @@ Boston, MA 02111-1307, USA.  */
         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} %{trigraphs}\
 	%{ffast-math:-D__FAST_MATH__}\
 	%{fshort-wchar:-D__WCHAR_TYPE__=short\\ unsigned\\ int}\
+	%{fshow-column} %{fno-show-column}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{!M:%{!MM:%{!E:%{!pipe:%g.ii}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
     "%{!M:%{!MM:%{!E:cc1plus %{!pipe:%g.ii} %1 %2\
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 0aa1ed1..05f420a 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-03  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* lang-specs.h: Pass -fno-show-column to the preprocessor.
+
 2000-03-28  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* com.c (ffecom_decl_field): Use DECL_ALIGN for a FIELD_DECL.
diff --git a/gcc/f/lang-specs.h b/gcc/f/lang-specs.h
index 4ee0657..ed715cb 100644
--- a/gcc/f/lang-specs.h
+++ b/gcc/f/lang-specs.h
@@ -43,6 +43,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 	%{!undef:%P} -D_LANGUAGE_FORTRAN %{trigraphs} \
 	%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} -traditional\
 	%{ffast-math:-D__FAST_MATH__}\
+	%{fshow-column} %{fno-show-column}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
 	%i %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
     "%{!M:%{!MM:%{!E:f771 %{!pipe:%g.i} %1 %(f771) \
diff --git a/gcc/gcc.c b/gcc/gcc.c
index a089aba..a5e6bbe 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -631,6 +631,7 @@ static struct compiler default_compilers[] =
         %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional}\
 	%{fleading-underscore} %{fno-leading-underscore}\
+	%{fshow-column} %{fno-show-column}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}}\n}\
       %{!E:%{!M:%{!MM:cc1 %i %1 \
@@ -667,6 +668,7 @@ static struct compiler default_compilers[] =
 	%{fshort-wchar:-D__WCHAR_TYPE__=short\\ unsigned\\ int}\
         %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional}\
+	%{fshow-column} %{fno-show-column}\
 	%{fleading-underscore} %{fno-leading-underscore}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
@@ -695,6 +697,7 @@ static struct compiler default_compilers[] =
 	%{fshort-wchar:-D__WCHAR_TYPE__=short\\ unsigned\\ int}\
         %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional}\
+	%{fshow-column} %{fno-show-column}\
 	%{fleading-underscore} %{fno-leading-underscore}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %W{o*}}\
@@ -713,6 +716,7 @@ static struct compiler default_compilers[] =
 	%{fshort-wchar:-D__WCHAR_TYPE__=short\\ unsigned\\ int}\
         %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional}\
+	%{fshow-column} %{fno-show-column}\
 	%{fleading-underscore} %{fno-leading-underscore}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %W{o*}"}},
@@ -743,6 +747,7 @@ static struct compiler default_compilers[] =
 	%{fshort-wchar:-D__WCHAR_TYPE__=short\\ unsigned\\ int}\
         %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional}\
+	%{fshow-column} %{fno-show-column}\
 	%{fleading-underscore} %{fno-leading-underscore}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{!M:%{!MM:%{!E:%{!pipe:%g.s}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h
index 69d0fec..a8411f3 100644
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
@@ -35,6 +35,7 @@ Boston, MA 02111-1307, USA.  */
         %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional}\
 	%{fleading-underscore} %{fno-leading-underscore}\
+	%{fshow-column} %{fno-show-column}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}}\n}",
     "%{!M:%{!MM:%{!E:cc1obj %i %1 \
@@ -68,6 +69,7 @@ Boston, MA 02111-1307, USA.  */
         %{traditional} %{ftraditional:-traditional}\
         %{traditional-cpp:-traditional}\
 	%{fleading-underscore} %{fno-leading-underscore}\
+	%{fshow-column} %{fno-show-column}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{!M:%{!MM:%{!E:%{!pipe:%g.mi}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
     "%{!M:%{!MM:%{!E:cc1obj %{!pipe:%g.mi} %1 \
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d0fd982..e5434d2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-03  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* gcc.dg/cpp-redef-2.c, gcc.dg/cpp-tradwarn1.c,
+	gcc.dg/cpp-unc.c: Add -fno-show-column to compiler options.
+
 Mon Apr  3 02:35:34 2000  Jeffrey A Law  (law@cygnus.com)
 
 	* gcc.c-torture/compile/20000403-2.c: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp-redef-2.c b/gcc/testsuite/gcc.dg/cpp-redef-2.c
index 99af954..0dacf07 100644
--- a/gcc/testsuite/gcc.dg/cpp-redef-2.c
+++ b/gcc/testsuite/gcc.dg/cpp-redef-2.c
@@ -1,7 +1,7 @@
 /* Test for redefining macros with significant differences.  */
 
 /* { dg-do preprocess }
-   { dg-options "-ansi -pedantic -Wall" } */
+   { dg-options "-ansi -pedantic -Wall -fno-show-column" } */
 
 #define mac(a, b) (a) + (b)
 #define mac(a, b) (a) * (b)
diff --git a/gcc/testsuite/gcc.dg/cpp-tradwarn1.c b/gcc/testsuite/gcc.dg/cpp-tradwarn1.c
index 9085ea6..550cbe2 100644
--- a/gcc/testsuite/gcc.dg/cpp-tradwarn1.c
+++ b/gcc/testsuite/gcc.dg/cpp-tradwarn1.c
@@ -1,6 +1,6 @@
 /* Test for warnings about nontraditional directives.  */
 /* { dg-do preprocess } */
-/* { dg-options "-pedantic -Wtraditional" } */
+/* { dg-options "-pedantic -Wtraditional -fno-show-column" } */
 
 /* Block 1: K+R directives should have the # indented.  */
 
diff --git a/gcc/testsuite/gcc.dg/cpp-unc.c b/gcc/testsuite/gcc.dg/cpp-unc.c
index 4daddf6..110a8a7 100644
--- a/gcc/testsuite/gcc.dg/cpp-unc.c
+++ b/gcc/testsuite/gcc.dg/cpp-unc.c
@@ -1,4 +1,5 @@
 /* { dg-do preprocess } */
+/* { dg-options "-fno-show-column" } */
 
 /* Tests for un-terminated conditional diagnostics.
    Copyright (c) 1999 Free Software Foundation.