diff options
| author | Nathan Sidwell <nathan@acm.org> | 2018-10-04 11:36:15 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2018-10-04 11:36:15 +0000 |
| commit | 668f8d452697359a150bd651149c75109f66eb06 (patch) | |
| tree | 7b0b0fc957981c72d0d27711ca12091def473b0d /gcc/cp | |
| parent | 9a471714928470c52b21586dd135658a02317c69 (diff) | |
| download | gcc-668f8d452697359a150bd651149c75109f66eb06.zip gcc-668f8d452697359a150bd651149c75109f66eb06.tar.gz gcc-668f8d452697359a150bd651149c75109f66eb06.tar.bz2 | |
[C++ PATCH] String concatenation is a thing
https://gcc.gnu.org/ml/gcc-patches/2018-10/msg00248.html
* lang-specs.h: Use string contatenation, not line splicing.
From-SVN: r264839
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/lang-specs.h | 46 |
2 files changed, 28 insertions, 22 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 40fa94f..c76340c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2018-10-04 Nathan Sidwell <nathan@acm.org> + + * lang-specs.h: Use string contatenation, not line splicing. + 2018-10-03 Jason Merrill <jason@redhat.com> Implement P0840, language support for empty objects. diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index f0802b8..ebae5c3 100644 --- a/gcc/cp/lang-specs.h +++ b/gcc/cp/lang-specs.h @@ -40,29 +40,31 @@ along with GCC; see the file COPYING3. If not see {".tcc", "@c++-header", 0, 0, 0}, {".hh", "@c++-header", 0, 0, 0}, {"@c++-header", - "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\ - %{!E:%{!M:%{!MM:\ - %{save-temps*|no-integrated-cpp:cc1plus -E\ - %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\ - cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\ - %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2\ - %{!fsyntax-only:%{!S:-o %g.s} \ - %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\ - %W{o*:--output-pch=%*}}%V}}}}", + "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}" + "%{!E:%{!M:%{!MM:" + " %{save-temps*|no-integrated-cpp:cc1plus -E" + " %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}" + " cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed" + " %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}" + " %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}" + " %(cc1_options) %2" + " %{!fsyntax-only:%{!S:-o %g.s}" + " %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}" + " %W{o*:--output-pch=%*}}%V}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, {"@c++", - "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\ - %{!E:%{!M:%{!MM:\ - %{save-temps*|no-integrated-cpp:cc1plus -E\ - %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\ - cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\ - %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", - CPLUSPLUS_CPP_SPEC, 0, 0}, + "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}" + "%{!E:%{!M:%{!MM:" + " %{save-temps*|no-integrated-cpp:cc1plus -E" + " %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}" + " cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed" + " %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}" + " %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}" + " %(cc1_options) %2" + " %{!fsyntax-only:%(invoke_as)}}}}", + CPLUSPLUS_CPP_SPEC, 0, 0}, {".ii", "@c++-cpp-output", 0, 0, 0}, {"@c++-cpp-output", - "%{!M:%{!MM:%{!E:\ - cc1plus -fpreprocessed %i %(cc1_options) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + "%{!E:%{!M:%{!MM:" + " cc1plus -fpreprocessed %i %(cc1_options) %2" + " %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, |