From 5726ad84860211fc1b26257b10dff0f00bb2de2f Mon Sep 17 00:00:00 2001 From: Steven Bosscher Date: Mon, 10 Dec 2012 17:58:45 +0000 Subject: [PATCH] * decl2.c (cp_write_global_declarations): Return after writing a PCH. From-SVN: r194363 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl2.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a5d0b76c615..50549a63a1a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2012-12-10 Steven Bosscher + + * decl2.c (cp_write_global_declarations): Return after writing a PCH. + 2012-12-07 Jason Merrill PR c++/55127 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 9ed53b819fc..fd54cac9047 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3944,8 +3944,13 @@ cp_write_global_declarations (void) || !vec_safe_is_empty (decl_namespace_list)) return; + /* This is the point to write out a PCH if we're doing that. + In that case we do not want to do anything else. */ if (pch_file) - c_common_write_pch (); + { + c_common_write_pch (); + return; + } cgraph_process_same_body_aliases (); -- 2.30.2