aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPer Bothner <per@bothner.com>2005-03-28 00:04:41 -0800
committerPer Bothner <bothner@gcc.gnu.org>2005-03-28 00:04:41 -0800
commit8abb6b2217202164ea30559a793ddbe364bfdd7f (patch)
treec0af1d58e10b837e10c8f141a5cb792a92065515 /gcc
parentcbada204b4afab8ce00f8ba828183cacd22af217 (diff)
downloadgcc-8abb6b2217202164ea30559a793ddbe364bfdd7f.zip
gcc-8abb6b2217202164ea30559a793ddbe364bfdd7f.tar.gz
gcc-8abb6b2217202164ea30559a793ddbe364bfdd7f.tar.bz2
Make -f[no-]show-column also control non-cpp diagnostics.
* c.opt (fshow-column): Move option from here ... * common.opt (fshow-column): ... to here. * diagnostic.c (diagnostic_build_prefix): Only print column number if flag_show_column. From-SVN: r97127
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/c.opt4
-rw-r--r--gcc/common.opt6
-rw-r--r--gcc/diagnostic.c2
4 files changed, 15 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 90a0032..eb471ba5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-26 Per Bothner <per@bothner.com>
+
+ Make -f[no-]show-column also control non-cpp diagnostics.
+ * c.opt (fshow-column): Move option from here ...
+ * common.opt (fshow-column): ... to here.
+ * diagnostic.c (diagnostic_build_prefix): Only print column number
+ if flag_show_column.
+
2005-03-27 Steven Bosscher <stevenb@suse.de>
* vax-protos.h (vax_output_int_move, vax_output_int_add,
diff --git a/gcc/c.opt b/gcc/c.opt
index 5613dd4..8efeae4 100644
--- a/gcc/c.opt
+++ b/gcc/c.opt
@@ -18,6 +18,7 @@
; Software Foundation, 59 Temple Place - Suite 330, Boston, MA
; 02111-1307, USA.
+; See the GCC internals manual for a description of this file's format.
; Please try to keep this file in ASCII collating order.
@@ -606,9 +607,6 @@ fshort-wchar
C ObjC C++ ObjC++
Force the underlying type for \"wchar_t\" to be \"unsigned short\"
-fshow-column
-C ObjC C++ ObjC++
-
fsigned-bitfields
C ObjC C++ ObjC++
When \"signed\" or \"unsigned\" is not given make the bitfield signed
diff --git a/gcc/common.opt b/gcc/common.opt
index d4cd60c..e53949d 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -19,7 +19,7 @@
; Software Foundation, 59 Temple Place - Suite 330, Boston, MA
; 02111-1307, USA.
-; See c.opt for a description of this file's format.
+; See the GCC internals manual for a description of this file's format.
; Please try to keep this file in ASCII collating order.
@@ -732,6 +732,10 @@ fshared-data
Common Report Var(flag_shared_data)
Mark data as shared rather than private
+fshow-column
+Common C ObjC C++ ObjC++ Report Var(flag_show_column) Init(1)
+Show column numbers in diagnostics, when available. Default on.
+
fsignaling-nans
Common Report Var(flag_signaling_nans)
Disable optimizations observable by IEEE signaling NaNs
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 39b46fc..5d10f0c 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -141,7 +141,7 @@ diagnostic_build_prefix (diagnostic_info *diagnostic)
(s.file == NULL
? build_message_string ("%s: %s", progname, text)
#ifdef USE_MAPPED_LOCATION
- : s.column != 0
+ : flag_show_column && s.column != 0
? build_message_string ("%s:%d:%d: %s", s.file, s.line, s.column, text)
#endif
: build_message_string ("%s:%d: %s", s.file, s.line, text));