From: steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 10 Dec 2012 17:58:45 +0000 (+0000)
Subject: 	* decl2.c (cp_write_global_declarations): Return after writing a PCH.
X-Git-Tag: upstream/4.9.2~8631
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=015b25933c72be10f325fede856a667ff84debb8;p=platform%2Fupstream%2Flinaro-gcc.git

	* decl2.c (cp_write_global_declarations): Return after writing a PCH.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a5d0b76..50549a6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-10  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* decl2.c (cp_write_global_declarations): Return after writing a PCH.
+
 2012-12-07  Jason Merrill  <jason@redhat.com>
 
 	PR c++/55127
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 9ed53b8..fd54cac 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 ();