re PR c/18502 (trigraphs don't work with -std=gnu99)

	PR c/18502
	* gcc.c (cpp_unique_options): Remove %{trigraphs}.
	(cpp_options, cc1_options): Change %{std*&ansi} to
	%{std*&ansi&trigraphs}.

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

From-SVN: r94632

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae56c6e1eefccc3c55bfca0669306366cf0b4c5d..21fe9baf915e75c7bca7d6740c3a2f74c15bfdd7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-02  Joseph S. Myers  <joseph@codesourcery.com>
+
+       PR c/18502
+       * gcc.c (cpp_unique_options): Remove %{trigraphs}.
+       (cpp_options, cc1_options): Change %{std*&ansi} to
+       %{std*&ansi&trigraphs}.
+
 2005-02-02  Kazu Hirata  <kazu@cs.umass.edu>
 
        * cse.c: Update comments.

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 99d92f954381ad91411ac9a85f40dbcab421255f..7f0322d2bb1fa4cd688a445dd9e53d407c48bd65 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -773,7 +773,7 @@ static const char *cpp_unique_options =
  %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}}\
  %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*}\
  %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}}\
- %{trigraphs} %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i\
+ %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i\
  %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
  %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
  %{E|M|MM:%W{o*}}";
@@ -784,9 +784,9 @@ 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*}\
- %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef}\
- %{save-temps:-fpch-preprocess}";
+"%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
+ %{f*} %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*}\
+ %{undef} %{save-temps:-fpch-preprocess}";
 
 /* This contains cpp options which are not passed when the preprocessor
    output will be used by another program.  */
@@ -797,7 +797,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&trigraphs}\
  %{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 e83ff1a7800daa0db9cb5ec950a2825c25da62b2..06a18e4e1f65e9d2d94fd4b13fe3441d4c4bd75c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-02  Joseph S. Myers  <joseph@codesourcery.com>
+
+       PR c/18502
+       * gcc.dg/pr18502-1.c: New test.
+
 2005-02-02  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        PR c++/17413

diff --git a/gcc/testsuite/gcc.dg/pr18502-1.c b/gcc/testsuite/gcc.dg/pr18502-1.c
new file mode 100644 (file)
index 0000000..038c810
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr18502-1.c
@@ -0,0 +1,7 @@
+/* Test that -trigraphs isn't reordered before -std=gnu99.  Bug
+   18502.  */
+/* Origin: Joseph Myers <joseph@codesourcery.com> */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu99 -trigraphs" } */
+
+int a??(2??);