From patchwork Thu Jun 10 15:11:24 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Remove cpplib show_column flag
Date: Thu, 10 Jun 2010 05:11:24 -0000
From: "Joseph S. Myers" <joseph@codesourcery.com>
X-Patchwork-Id: 55230
Message-Id: <Pine.LNX.4.64.1006101511030.1496@digraph.polyomino.org.uk>
To: gcc-patches@gcc.gnu.org

Since cpplib now uses GCC's diagnostic machinery rather than having
such machinery of its own, cpplib's show_column flag is not used for
anything.  This patch removes it.

Bootstrapped with no regressions on x86_64-unknown-linux-gnu.  Applied
to mainline.

gcc:
2010-06-10  Joseph Myers  <joseph@codesourcery.com>

	* common.opt (fshow-column): Don't mark as C ObjC C++ ObjC++.

gcc/c-family:
2010-06-10  Joseph Myers  <joseph@codesourcery.com>

	* c-opts.c (c_common_handle_option): Don't handle
	OPT_fshow_column.

libcpp:
2010-06-10  Joseph Myers  <joseph@codesourcery.com>

	* include/cpplib.h (struct cpp_options): Remove show_column.
	* init.c (cpp_create_reader, post_options): Don't set show_column.


Index: gcc/c-family/c-opts.c
===================================================================
--- gcc/c-family/c-opts.c	(revision 160531)
+++ gcc/c-family/c-opts.c	(working copy)
@@ -759,10 +759,6 @@ c_common_handle_option (size_t scode, co
 	flag_implicit_templates = 0;
       break;
 
-    case OPT_fshow_column:
-      cpp_opts->show_column = value;
-      break;
-
     case OPT_ftabstop_:
       /* It is documented that we silently ignore silly values.  */
       if (value >= 1 && value <= 100)
Index: gcc/common.opt
===================================================================
--- gcc/common.opt	(revision 160531)
+++ gcc/common.opt	(working copy)
@@ -1152,7 +1152,7 @@ Common Report Var(flag_zee) Init(0)
 Eliminate redundant zero extensions on targets that support implicit extensions.
 
 fshow-column
-Common C ObjC C++ ObjC++ Report Var(flag_show_column) Init(1)
+Common Report Var(flag_show_column) Init(1)
 Show column numbers in diagnostics, when available.  Default on
 
 fsignaling-nans
Index: libcpp/include/cpplib.h
===================================================================
--- libcpp/include/cpplib.h	(revision 160531)
+++ libcpp/include/cpplib.h	(working copy)
@@ -1,6 +1,6 @@
 /* Definitions for CPP library.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2007, 2008, 2009
+   2004, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    Written by Per Bothner, 1994-95.
 
@@ -389,9 +389,6 @@ struct cpp_options
      bother trying to do macro expansion and whatnot.  */
   unsigned char preprocessed;
 
-  /* Print column number in error messages.  */
-  unsigned char show_column;
-
   /* Nonzero means handle C++ alternate operator names.  */
   unsigned char operator_names;
 
Index: libcpp/init.c
===================================================================
--- libcpp/init.c	(revision 160531)
+++ libcpp/init.c	(working copy)
@@ -156,7 +156,6 @@ cpp_create_reader (enum c_lang lang, has
   CPP_OPTION (pfile, warn_multichar) = 1;
   CPP_OPTION (pfile, discard_comments) = 1;
   CPP_OPTION (pfile, discard_comments_in_macro_exp) = 1;
-  CPP_OPTION (pfile, show_column) = 1;
   CPP_OPTION (pfile, tabstop) = 8;
   CPP_OPTION (pfile, operator_names) = 1;
   CPP_OPTION (pfile, warn_trigraphs) = 2;
@@ -717,8 +716,6 @@ post_options (cpp_reader *pfile)
     {
       CPP_OPTION (pfile, cplusplus_comments) = 0;
 
-      /* Traditional CPP does not accurately track column information.  */
-      CPP_OPTION (pfile, show_column) = 0;
       CPP_OPTION (pfile, trigraphs) = 0;
       CPP_OPTION (pfile, warn_trigraphs) = 0;
     }