gcc.c (default_compilers): Pass "-o %g.s" to cc1 for headers even if -fdump-ada-spec...

	* gcc.c (default_compilers): Pass "-o %g.s" to cc1 for headers even if
	-fdump-ada-spec is passed but not if -fsyntax-only is.
cp/
	* lang-specs.h: Pass "-o %g.s" to cc1plus for headers even if
	-fdump-ada-spec is passed.

From-SVN: r224755

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05ed274..e5a5764 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-22  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+       * gcc.c (default_compilers): Pass "-o %g.s" to cc1 for headers even if
+       -fdump-ada-spec is passed but not if -fsyntax-only is.
+
 2015-06-22  Vladimir Makarov  <vmakarov@redhat.com>
 
        PR bootstrap/63740

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f8ad21b..4790448 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-04  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+       * lang-specs.h: Pass "-o %g.s" to cc1plus for headers even if
+       -fdump-ada-spec is passed.
+
 2015-06-22  Pierre-Marie de Rodat  <derodat@adacore.com>
 
        * decl2.c (cpp_check): Deal with HAS_DEPENDENT_TEMPLATE_ARGS.

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index b0728f0..8a2f31e 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -47,8 +47,9 @@ along with GCC; see the file COPYING3.  If not see
       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:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\
-        %W{o*:--output-pch=%*}}%V}}}}",
+       %{!fsyntax-only:-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)}\

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 9224bd8..d77c6c5 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1175,12 +1175,14 @@ static const struct compiler default_compilers[] =
                %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
                    cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
                        %(cc1_options)\
-                        %{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\
-                        %W{o*:--output-pch=%*}}%V}\
+                       %{!fsyntax-only:-o %g.s \
+                           %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\
+                                              %W{o*:--output-pch=%*}}%V}}\
          %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\
                cc1 %(cpp_unique_options) %(cc1_options)\
-                    %{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\
-                    %W{o*:--output-pch=%*}}%V}}}}}}", 0, 0, 0},
+                   %{!fsyntax-only:-o %g.s \
+                       %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\
+                                          %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
   {".i", "@cpp-output", 0, 0, 0},
   {"@cpp-output",
    "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},