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

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

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

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

From-SVN: r160553

gcc/ChangeLog

+2010-06-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* common.opt (fshow-column): Don't mark as C ObjC C++ ObjC++.
+
 2010-06-10  Jan Hubicka  <jh@suse.cz>
 
 	* df-problems.c (df_live_problem_data): Add live_bitmaps.

gcc/c-family/ChangeLog

+2010-06-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-opts.c (c_common_handle_option): Don't handle
+	OPT_fshow_column.
+
 2010-06-08  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
 
 	* c-pragma.c (push_alignment): Use typed GC allocation.

gcc/c-family/c-opts.c

@@ -759,10 +759,6 @@ c_common_handle_option (size_t scode, const char *arg, int value,
 	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)

gcc/common.opt

@@ -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

libcpp/ChangeLog

+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.
+
 2010-06-09  Joern Rennecke  <joern.rennecke@embecosm.com>
 
 	PR bootstrap/44432

libcpp/include/cpplib.h

 /* 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;
 

libcpp/init.c

@@ -156,7 +156,6 @@ cpp_create_reader (enum c_lang lang, hash_table *table,
   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;
     }