diff options
| author | Martin Liska <mliska@suse.cz> | 2022-09-06 06:52:14 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-09-06 06:52:14 +0200 |
| commit | 918bc838c2803f08e4d7ccd179396d48cb8ec804 (patch) | |
| tree | 2496c039b51fd33ee4309d910f0f6ce44cd5f749 /libcpp | |
| parent | 8de5354e2cf4e6ea750ea92c7162d61b1b796f76 (diff) | |
| parent | 47d2dcd1397bf02b79515c39438e0ea9898f9056 (diff) | |
| download | gcc-918bc838c2803f08e4d7ccd179396d48cb8ec804.zip gcc-918bc838c2803f08e4d7ccd179396d48cb8ec804.tar.gz gcc-918bc838c2803f08e4d7ccd179396d48cb8ec804.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 4 | ||||
| -rw-r--r-- | libcpp/init.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index c9f2f6b..7aba4f5 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2022-09-05 Joseph Myers <joseph@codesourcery.com> + + * init.cc (lang_defaults): Disable trigraphs for C2x. + 2022-09-02 David Malcolm <dmalcolm@redhat.com> PR c/90885 diff --git a/libcpp/init.cc b/libcpp/init.cc index 41b10b3..3e5601a 100644 --- a/libcpp/init.cc +++ b/libcpp/init.cc @@ -112,7 +112,7 @@ static const struct lang_flags lang_defaults[] = /* STDC99 */ { 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, /* STDC11 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, /* STDC17 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - /* STDC2X */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0 }, + /* STDC2X */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0 }, /* GNUCXX */ { 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0 }, /* CXX98 */ { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 }, /* GNUCXX11 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0 }, |