diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a4a14b86ba..1c32c211506 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* gengenrtl.c (gendef): Use rtx_alloc, don't do PUT_CODE.
+	* ggc.h (ggc_alloc_rtx): Delete.
+
 2004-09-01  Roger Sayle  <roger@eyesopen.com>
 
 	* expmed.c (enum alg_code): Remove long unused enumeration values.
diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c
index 39f1dc26853..e8d083b4435 100644
--- a/gcc/gengenrtl.c
+++ b/gcc/gengenrtl.c
@@ -268,10 +268,8 @@ gendef (const char *format)
      the memory and initializes it.  */
   puts ("{");
   puts ("  rtx rt;");
-  puts ("  rt = ggc_alloc_rtx (code);\n");
+  puts ("  rt = rtx_alloc (code);\n");
 
-  puts ("  memset (rt, 0, RTX_HDR_SIZE);\n");
-  puts ("  PUT_CODE (rt, code);");
   puts ("  PUT_MODE (rt, mode);");
 
   for (p = format, i = j = 0; *p ; ++p, ++i)
diff --git a/gcc/ggc.h b/gcc/ggc.h
index 821de0c2b32..13ac2c5c5c5 100644
--- a/gcc/ggc.h
+++ b/gcc/ggc.h
@@ -245,9 +245,6 @@ extern void dump_ggc_loc_statistics (void);
 #define GGC_NEWVAR(T, S)	((T *) ggc_alloc ((S)))
 #define GGC_CNEWVAR(T, S)	((T *) ggc_alloc_cleared ((S)))
 
-#define ggc_alloc_rtx(CODE)                    \
-  ((rtx) ggc_alloc_typed (gt_ggc_e_7rtx_def, RTX_SIZE (CODE)))
-
 #define ggc_alloc_rtvec(NELT)						  \
   ((rtvec) ggc_alloc_typed (gt_ggc_e_9rtvec_def, sizeof (struct rtvec_def) \
 		      + ((NELT) - 1) * sizeof (rtx)))