diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c2404886322..e2f8892a180 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* expr.c (get_def_for_expr_class): Define only if
+	HAVE_conditional_move.
+	(convert_tree_comp_to_rtx): Likewise.
+
 2012-05-21  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/53399
diff --git a/gcc/expr.c b/gcc/expr.c
index 0d52725ae07..e6def73e6e4 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -2353,6 +2353,7 @@ get_def_for_expr (tree name, enum tree_code code)
   return def_stmt;
 }
 
+#ifdef HAVE_conditional_move
 /* Return the defining gimple statement for SSA_NAME NAME if it is an
    assigment and the class of the expresion on the RHS is CLASS.  Return
    NULL otherwise.  */
@@ -2372,6 +2373,7 @@ get_def_for_expr_class (tree name, enum tree_code_class tclass)
 
   return def_stmt;
 }
+#endif
 
 
 /* Determine whether the LEN bytes generated by CONSTFUN can be
@@ -7371,6 +7373,7 @@ highest_pow2_factor_for_target (const_tree target, const_tree exp)
   return MAX (factor, talign);
 }
 
+#ifdef HAVE_conditional_move
 /* Convert the tree comparision code TCODE to the rtl one where the
    signedness is UNSIGNEDP.  */
 
@@ -7428,6 +7431,7 @@ convert_tree_comp_to_rtx (enum tree_code tcode, int unsignedp)
     }
   return code;
 }
+#endif
 
 /* Subroutine of expand_expr.  Expand the two operands of a binary
    expression EXP0 and EXP1 placing the results in OP0 and OP1.