re PR c/11459 (-ansi -std=c99 -pedantic warns about C90's non long-long support when...

	PR c/11459
	* gcc.c (cpp_options, cc1_options): Preserve relative order of
	-std and -ansi options.

testsuite:
	* gcc.dg/pr11459-1.c: New test.

From-SVN: r88121

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7db9dc66d8df7bc126c0bc40c05bd5ff80d2cc76..31f059cdd7ff687539a1f123981012fce85ae268 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-26  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+       PR c/11459
+       * gcc.c (cpp_options, cc1_options): Preserve relative order of
+       -std and -ansi options.
+
 2004-09-26  Jan Hubicka  <jh@suse.cz>
 
        * dwarf2out.c (dwarf2out_finish): Set parent to comp_unit_die

diff --git a/gcc/gcc.c b/gcc/gcc.c
index e6f72bf3cdf0c85264afbdddce8dfbb900630bc4..ca510f99f3b624b7306ccc8f77d43011c739af11 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -783,7 +783,7 @@ static const char *cpp_unique_options =
    options used to set target flags.  Those special target flags settings may
    in turn cause preprocessor symbols to be defined specially.  */
 static const char *cpp_options =
-"%(cpp_unique_options) %1 %{m*} %{std*} %{ansi} %{W*&pedantic*} %{w} %{f*}\
+"%(cpp_unique_options) %1 %{m*} %{std*&ansi} %{W*&pedantic*} %{w} %{f*}\
  %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef}\
  %{save-temps:-fpch-preprocess}";
 
@@ -796,7 +796,7 @@ 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*}\
  %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\
- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi}\
+ %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi}\
  %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\
  %{Qn:-fno-ident} %{--help:--help}\
  %{--target-help:--target-help}\

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2dff62bb8c997165dd4372ac48a1308a62652290..32c3d51a555aa67a88ae2c74e13598e97910ee76 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-26  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+       PR c/11459
+       * gcc.dg/pr11459-1.c: New test.
+
 2004-09-25  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * gcc.dg/tree-ssa/loop-2.c: Avoid matching new-line in regexp.

diff --git a/gcc/testsuite/gcc.dg/pr11459-1.c b/gcc/testsuite/gcc.dg/pr11459-1.c
new file mode 100644 (file)
index 0000000..1edd94f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr11459-1.c
@@ -0,0 +1,6 @@
+/* -ansi -std=c99 should mean -std=c99, but the specs reordered the
+    options.  Bug 11459.  */
+/* { dg-do compile } */
+/* { dg-options "-ansi -std=c99 -pedantic" } */
+
+long long i;