From ab4bb1b30019f18efec222d2ab3d3c91d2a98622 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Tue, 27 Dec 2016 15:37:05 -0500 Subject: [PATCH] cppopts.texi: Delete redundant documentation for -x. 2016-12-27 Sandra Loosemore gcc/ * doc/cppopts.texi: Delete redundant documentation for -x. Move -fno-show-column documentation to... * doc/invoke.texi (Diagnostic Message Formatting Options): ...here. Update the option summary. From-SVN: r243944 --- gcc/ChangeLog | 7 +++++++ gcc/doc/cppopts.texi | 25 ------------------------- gcc/doc/invoke.texi | 9 ++++++++- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1e894a20bf0..1f17c9e9df6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-12-27 Sandra Loosemore + + * doc/cppopts.texi: Delete redundant documentation for -x. Move + -fno-show-column documentation to... + * doc/invoke.texi (Diagnostic Message Formatting Options): ...here. + Update the option summary. + 2016-12-27 Uros Bizjak * config/i386/i386.md (VI_512): Remove. diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi index 567a74813b7..7de6ca131c0 100644 --- a/gcc/doc/cppopts.texi +++ b/gcc/doc/cppopts.texi @@ -297,25 +297,6 @@ location. The filename may be absolute or it may be relative to GCC's current directory. @end ifclear -@item -x c -@itemx -x c++ -@itemx -x objective-c -@itemx -x assembler-with-cpp -@opindex x -Specify the source language: C, C++, Objective-C, or assembly. This has -nothing to do with standards conformance or extensions; it merely -selects which base syntax to expect. If you give none of these options, -cpp will deduce the language from the extension of the source file: -@samp{.c}, @samp{.cc}, @samp{.m}, or @samp{.S}. Some other common -extensions for C++ and assembly are also recognized. If cpp does not -recognize the extension, it will treat the file as C; this is the most -generic mode. - -@emph{Note:} Previous versions of cpp accepted a @option{-lang} option -which selected both the language and the standards conformance level. -This option has been removed, because it conflicts with the @option{-l} -option. - @item -I- @opindex I- Split the include path. Any directories specified with @option{-I} @@ -564,12 +545,6 @@ form @option{-fno-working-directory}. If the @option{-P} flag is present in the command line, this option has no effect, since no @code{#line} directives are emitted whatsoever. -@item -fno-show-column -@opindex fno-show-column -Do not print column numbers in diagnostics. This may be necessary if -diagnostics are being scanned by a program that does not understand the -column numbers, such as @command{dejagnu}. - @item -A @var{predicate}=@var{answer} @opindex A Make an assertion with the predicate @var{predicate} and answer diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index b27691458ff..1d5b04ddfd8 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -250,7 +250,8 @@ Objective-C and Objective-C++ Dialects}. -fdiagnostics-show-location=@r{[}once@r{|}every-line@r{]} @gol -fdiagnostics-color=@r{[}auto@r{|}never@r{|}always@r{]} @gol -fno-diagnostics-show-option -fno-diagnostics-show-caret @gol --fdiagnostics-parseable-fixits -fdiagnostics-generate-patch} +-fdiagnostics-parseable-fixits -fdiagnostics-generate-patch @gol +-fno-show-column} @item Warning Options @xref{Warning Options,,Options to Request or Suppress Warnings}. @@ -3546,6 +3547,12 @@ are printed. For example: The diff may or may not be colorized, following the same rules as for diagnostics (see @option{-fdiagnostics-color}). +@item -fno-show-column +@opindex fno-show-column +Do not print column numbers in diagnostics. This may be necessary if +diagnostics are being scanned by a program that does not understand the +column numbers, such as @command{dejagnu}. + @end table @node Warning Options -- 2.30.2