summaryrefslogtreecommitdiff
path: root/gcc/gcc.c
diff options
context:
space:
mode:
authorpme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-26 21:38:40 +0000
committerpme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-26 21:38:40 +0000
commit2d9c87159b4cb075883dfee9289704e06f241cfb (patch)
tree7283a7061f177aa01f0dd489d97a91fee034cc5e /gcc/gcc.c
parent8546dce905d1083b2ef8e94b0435bff38466b590 (diff)
downloadgcc-2d9c87159b4cb075883dfee9289704e06f241cfb.tar.gz
2002-03-26 Phil Edwards <pme@gcc.gnu.org>
* gcc.c (cpp_options): Preserve relative ordering of -pedantic and warning switches. (cc1_options): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51408 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/gcc.c')
-rw-r--r--gcc/gcc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5787b0e05bf..c9098acfc26 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -681,7 +681,7 @@ static const char *cpp_unique_options =
/* This contains cpp options which are common with cc1_options and are passed
only when preprocessing only to avoid duplication. */
static const char *cpp_options =
-"%(cpp_unique_options) %{std*} %{d*} %{W*} %{w} %{pedantic*}\
+"%(cpp_unique_options) %{std*} %{d*} %{W*&pedantic*} %{w}\
%{fshow-column} %{fno-show-column}\
%{fsigned-char&funsigned-char}\
%{fleading-underscore} %{fno-leading-underscore}\
@@ -691,7 +691,7 @@ static const char *cpp_options =
static const char *cc1_options =
"%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
%1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
- %{g*} %{O*} %{W*} %{w} %{pedantic*} %{std*} %{ansi}\
+ %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi}\
%{v:-version} %{pg:-p} %{p} %{f*}\
%{Qn:-fno-ident} %{--help:--help}\
%{--target-help:--target-help}\