diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1405a5b073d..fbe0637d5f1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-01  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* decl.c (record_builtin_java_type): Undo unintended change.
+	(cxx_init_decl_processing): Likewise.
+
 2009-10-01  Jason Merrill  <jason@redhat.com>
 
 	* pt.c (register_specialization): Push DECL_SOURCE_LOCATION to the
@@ -12,8 +17,6 @@
 
 	* decl.c (check_for_uninitialized_const_var): Check constexpr
 	variables too.
-	(build_ptrmemfunc_type): Make the result a literal type.
-	(build_ptrmem_type): Likewise.
 	(grokdeclarator): Handle `constexpr'.
 	(check_tag_decl): Reject `constexpr'.
 	(check_function_type): Check constexpr functions.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 9f5ca30121d..5d3ff9dad42 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3231,7 +3231,7 @@ record_builtin_java_type (const char* name, int size)
     }
   else
     { /* "__java_float" or ""__java_double".  */
-      type = cxx_make_type (REAL_TYPE);
+      type = make_node (REAL_TYPE);
       TYPE_PRECISION (type) = - size;
       layout_type (type);
     }
@@ -3397,7 +3397,7 @@ cxx_init_decl_processing (void)
 
   /* C++ extensions */
 
-  unknown_type_node = cxx_make_type (UNKNOWN_TYPE);
+  unknown_type_node = make_node (UNKNOWN_TYPE);
   record_unknown_type (unknown_type_node, "unknown type");
 
   /* Indirecting an UNKNOWN_TYPE node yields an UNKNOWN_TYPE node.  */
@@ -3408,13 +3408,13 @@ cxx_init_decl_processing (void)
   TYPE_POINTER_TO (unknown_type_node) = unknown_type_node;
   TYPE_REFERENCE_TO (unknown_type_node) = unknown_type_node;
 
-  init_list_type_node = cxx_make_type (UNKNOWN_TYPE);
+  init_list_type_node = make_node (UNKNOWN_TYPE);
   record_unknown_type (init_list_type_node, "init list");
 
   {
     /* Make sure we get a unique function type, so we can give
        its pointer type a name.  (This wins for gdb.) */
-    tree vfunc_type = cxx_make_type (FUNCTION_TYPE);
+    tree vfunc_type = make_node (FUNCTION_TYPE);
     TREE_TYPE (vfunc_type) = integer_type_node;
     TYPE_ARG_TYPES (vfunc_type) = NULL_TREE;
     layout_type (vfunc_type);
@@ -3436,7 +3436,7 @@ cxx_init_decl_processing (void)
   abi_node = current_namespace;
   pop_namespace ();
 
-  global_type_node = cxx_make_type (LANG_TYPE);
+  global_type_node = make_node (LANG_TYPE);
   record_unknown_type (global_type_node, "global type");
 
   /* Now, C++.  */