summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2015-06-22 19:19:48 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2015-06-22 19:19:48 +0000
commit53a7bd71ddaa01f1a04cc74bfe5b8d2f975a5711 (patch)
tree6e674c2f0f306ef647ec17b2c320897df3f4ff48
parent99838ed7075b729130895888cd20a421ea4227ca (diff)
downloadgcc-53a7bd71ddaa01f1a04cc74bfe5b8d2f975a5711.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224755 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/lang-specs.h5
-rw-r--r--gcc/gcc.c10
4 files changed, 19 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05ed274a9f7..e5a5764404b 100644
--- 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 f8ad21b17c7..479044807ef 100644
--- 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 b0728f081db..8a2f31e17f9 100644
--- 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 9224bd85248..d77c6c5692a 100644
--- 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},