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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df46d03..b911fe5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-26  Phil Edwards  <pme@gcc.gnu.org>
+
+       * gcc.c (cpp_options):  Preserve relative ordering of -pedantic
+       and warning switches.
+       (cc1_options):  Likewise.
+
 2002-03-26  Hans Boehm <Hans_Boehm@hp.com>
        * config/ia64/linux.h (MD_FALLBACK_FRAME_STATE_FOR):
        Restore more of the signal context.  Set no_reg_stack_frame.

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5787b0e..c9098ac 100644 (file)
--- 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}\