diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00e0c6a994f..4de76bdddb3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-28  Paolo Bonzini  <bonzini@gnu.org>
+
+        * config/m32c/m32c.c (TARGET_PROMOTE_FUNCTION_RETURN,
+        m32c_promote_function_return, TARGET_PROMOTE_PROTOTYPES,
+        m32c_promote_prototypes): Delete.
+
 2009-04-28  Michael Matz  <matz@suse.de>
 
 	PR middle-end/39922
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index cb09aef254c..bd33934dbed 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -442,14 +442,6 @@ m32c_init_expanders (void)
 
 /* Storage Layout */
 
-#undef TARGET_PROMOTE_FUNCTION_RETURN
-#define TARGET_PROMOTE_FUNCTION_RETURN m32c_promote_function_return
-bool
-m32c_promote_function_return (const_tree fntype ATTRIBUTE_UNUSED)
-{
-  return false;
-}
-
 /* Register Basics */
 
 /* Basic Characteristics of Registers */
@@ -1440,14 +1432,6 @@ m32c_initial_elimination_offset (int from, int to)
 
 /* Passing Function Arguments on the Stack */
 
-#undef TARGET_PROMOTE_PROTOTYPES
-#define TARGET_PROMOTE_PROTOTYPES m32c_promote_prototypes
-static bool
-m32c_promote_prototypes (const_tree fntype ATTRIBUTE_UNUSED)
-{
-  return 0;
-}
-
 /* Implements PUSH_ROUNDING.  The R8C and M16C have byte stacks, the
    M32C has word stacks.  */
 int