1 files changed, 21 insertions, 18 deletions

diff --git a/contrib/gcc/ggc-none.c b/contrib/gcc/ggc-none.c
index 659bf93..3163a52 100644
--- a/contrib/gcc/ggc-none.c
+++ b/contrib/gcc/ggc-none.c
@@ -1,5 +1,5 @@
 /* Null garbage collection for the GNU compiler.
-   Copyright (C) 1998, 1999, 2000, 2003
+   Copyright (C) 1998, 1999, 2000, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GCC.
@@ -16,47 +16,50 @@
 
    You should have received a copy of the GNU General Public License
    along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
-/* This version is used by the gen* programs, where we don't really
-   need GC at all.  This prevents problems with pulling in all the
-   tree stuff.  */
+/* This version is used by the gen* programs and certain language-specific
+   targets (such as java), where we don't really need GC at all.
+   This prevents problems with pulling in all the tree stuff.  */
 
+#ifdef GENERATOR_FILE
+#include "bconfig.h"
+#else
 #include "config.h"
+#endif
+
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "ggc.h"
-struct alloc_zone *rtl_zone = NULL;
-struct alloc_zone *garbage_zone = NULL;
 
 void *
-ggc_alloc_typed (enum gt_types_enum gte ATTRIBUTE_UNUSED, size_t size)
+ggc_alloc_typed_stat (enum gt_types_enum ARG_UNUSED (gte), size_t size
+		      MEM_STAT_DECL)
 {
   return xmalloc (size);
 }
 
 void *
-ggc_alloc (size_t size)
+ggc_alloc_stat (size_t size MEM_STAT_DECL)
 {
   return xmalloc (size);
 }
 
 void *
-ggc_alloc_zone (size_t size, struct alloc_zone *zone ATTRIBUTE_UNUSED)
+ggc_alloc_cleared_stat (size_t size MEM_STAT_DECL)
 {
-  return xmalloc (size);
+  return xcalloc (size, 1);
 }
 
 void *
-ggc_alloc_cleared (size_t size)
+ggc_realloc_stat (void *x, size_t size MEM_STAT_DECL)
 {
-  return xcalloc (size, 1);
+  return xrealloc (x, size);
 }
 
-void *
-ggc_realloc (void *x, size_t size)
+void
+ggc_free (void *p)
 {
-  return xrealloc (x, size);
+  free (p);
 }