From 1cb4261144d0e97c0f0faf79fbfa0230dcedaf63 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 10 Jun 2010 16:10:11 +0100
Subject: [PATCH] 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 | 4 ++++
gcc/c-family/ChangeLog | 5 +++++
gcc/c-family/c-opts.c | 4 ----
gcc/common.opt | 2 +-
libcpp/ChangeLog | 5 +++++
libcpp/include/cpplib.h | 5 +----
libcpp/init.c | 3 ---
7 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f5ad8a0e75a0..bc08a5a7b315 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 5370a8e8b329..bd9c0f55975b 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index a48dea1e68dd..0d75615c7928 100644
--- a/gcc/c-family/c-opts.c
+++ b/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)
diff --git a/gcc/common.opt b/gcc/common.opt
index a7b0e7371074..a96158237ddd 100644
--- a/gcc/common.opt
+++ b/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
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index d6d9b6cf7c29..d52da05f937c 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index 0828ea40f931..ba79262f6cd1 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -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;
diff --git a/libcpp/init.c b/libcpp/init.c
index ae5ae4548c87..c5b8c28e3427 100644
--- a/libcpp/init.c
+++ b/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;
}
--
GitLab