lang-specs.h: Use new | syntax to eliminate string concatenation.

1998-06-25  Dave Brolley  <brolley@cygnus.com>
	* lang-specs.h: Use new | syntax to eliminate
	string concatenation.

From-SVN: r20712

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 699d6bca82d9fa4e63bec2b448677cbedac34297..97fd41b806ab3d2c7b43a1aaff30ac3bb2e7ab1a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-25  Dave Brolley  <brolley@cygnus.com>
+
+       * lang-specs.h: Use new | syntax to eliminate
+       string concatenation.
+
 1998-06-25  Jason Merrill  <jason@yorick.cygnus.com>
 
        * cp-tree.h (CP_DECL_CONTEXT): New macro.

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index 88ac4d8873ec4e307d1d71a100b8ad8f921944d4..b208ca18dbc7178a308457b79fecfe0444f836f0 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
   {"@c++",
 #if USE_CPPLIB
    {
-#define CPP_FOR_CXX "cpp -lang-c++ %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
+     "%{E|M|MM:cpp -lang-c++ %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
        %{C:%{!E:%eGNU C++ does not support -C without using -E}}\
        %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
        -undef -D__GNUC__=%v1 -D__GNUG__=%v1 -D__cplusplus -D__GNUC_MINOR__=%v2\
@@ -39,12 +39,8 @@ Boston, MA 02111-1307, USA.  */
         %{fhonor-std:-D__HONOR_STD} %{fnew-abi:-D__HONOR_STD}\
         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} %{trigraphs}\
        %{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
-        %i %{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n"
-
-     "%{E:"CPP_FOR_CXX"}"
-     "%{!E:%{M:"CPP_FOR_CXX"}"
-          "%{!M:%{MM:"CPP_FOR_CXX"}"
-               "%{!MM:cc1plus %i %1 %2\
+        %i %{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}}\n}\
+      %{!E:%{!M:%{!MM:cc1plus %i %1 %2\
                             -lang-c++ %{nostdinc*} %{C} %{A*} %{I*} %{P} %I\
                             -undef -D__GNUC__=%v1 -D__GNUG__=%v1 -D__cplusplus\
                             -D__GNUC_MINOR__=%v2\
@@ -63,7 +59,6 @@ Boston, MA 02111-1307, USA.  */
               %{!S:as %a %Y\
                      %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
                       %{!pipe:%g.s} %A\n }}}}"}},
-#undef CPP_FOR_CXX
 #else /* ! USE_CPPLIB */
    {"cpp -lang-c++ %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
        %{C:%{!E:%eGNU C++ does not support -C without using -E}}\