From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 4 Oct 2018 11:36:15 +0000 (+0000)
Subject: [C++ PATCH] String concatenation is a thing
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b35b34d519e5ec808158d6d53d08c31cd6a4270;p=thirdparty%2Fgcc.git

[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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@264839 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 40fa94fee4e4..c76340cb23f2 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 f0802b8915c6..ebae5c3b4445 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},