aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2005-02-02 23:01:11 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2005-02-02 23:01:11 +0000
commit740ca4b2b10f7b6bd13568988b659b436143b1a9 (patch)
treed05a8f5e9792615448ca9373c4e39ea634d64642
parenta52aff238daff783f5ba3bf6ee9b309e01d04fa4 (diff)
downloadgcc-740ca4b2b10f7b6bd13568988b659b436143b1a9.zip
gcc-740ca4b2b10f7b6bd13568988b659b436143b1a9.tar.gz
gcc-740ca4b2b10f7b6bd13568988b659b436143b1a9.tar.bz2
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
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/gcc.c10
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/pr18502-1.c7
4 files changed, 24 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae56c6e..21fe9ba 100644
--- 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 99d92f9..7f0322d 100644
--- 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 e83ff1a..06a18e4 100644
--- 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
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??);