From: Laurynas Biveinis <laurynas.biveinis@gmail.com>
Date: Tue, 30 Nov 2010 04:12:56 +0000 (+0000)
Subject: ggc-zone.c (ggc_pch_read): Fix conditional compilation.
X-Git-Tag: releases/gcc-4.6.0~2246
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d88f54b34048d019e12a97a1094b3d94e83cb60c;p=thirdparty%2Fgcc.git

ggc-zone.c (ggc_pch_read): Fix conditional compilation.

2010-11-30  Laurynas Biveinis  <laurynas.biveinis@gmail.com>

	* ggc-zone.c (ggc_pch_read): Fix conditional compilation.
	* ggc-none.c (ggc_internal_alloc_zone_stat)
	(ggc_internal_cleared_alloc_zone_stat): New.

From-SVN: r167284
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index daf7fa187a06..00aa275e3fbe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-30  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+	* ggc-zone.c (ggc_pch_read): Fix conditional compilation.
+	* ggc-none.c (ggc_internal_alloc_zone_stat)
+	(ggc_internal_cleared_alloc_zone_stat): New.
+
 2010-11-29  Joakim Tjernlund  <Joakim.Tjernlund@transmode.se>
 
 	* config/rs6000/rs6000.c (rs6000_reg_live_or_pic_offset_p): Check
diff --git a/gcc/ggc-none.c b/gcc/ggc-none.c
index f9c48cb8cc59..97d25b9b6536 100644
--- a/gcc/ggc-none.c
+++ b/gcc/ggc-none.c
@@ -71,3 +71,22 @@ struct alloc_zone
 struct alloc_zone rtl_zone;
 struct alloc_zone tree_zone;
 struct alloc_zone tree_id_zone;
+
+#if defined (GGC_ZONE) && !defined (GENERATOR_FILE)
+
+void *
+ggc_internal_alloc_zone_stat (size_t size,
+                              struct alloc_zone * ARG_UNUSED(z) MEM_STAT_DECL)
+{
+    return xmalloc (size);
+}
+
+void *
+ggc_internal_cleared_alloc_zone_stat (size_t size,
+                                      struct alloc_zone * ARG_UNUSED(z)
+                                      MEM_STAT_DECL)
+{
+    return xcalloc (size, 1);
+}
+
+#endif
diff --git a/gcc/ggc-zone.c b/gcc/ggc-zone.c
index bd68008f63b7..43472be79bd1 100644
--- a/gcc/ggc-zone.c
+++ b/gcc/ggc-zone.c
@@ -2464,7 +2464,7 @@ ggc_pch_read (FILE *f, void *addr)
 
   /* We've just read in a PCH file.  So, every object that used to be
      allocated is now free.  */
-#ifdef 0 && GATHER_STATISTICS
+#ifdef GATHER_STATISTICS
   zone_allocate_marks ();
   ggc_prune_overhead_list ();
   zone_free_marks ();