diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eee6e8447fdd9c2c92df169d5735a7d3e4f8c03d..82b15ed63e259abd868d2b3ec3f92fbb20c877b5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-01  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	Revert due to PR40320:
+	
+	2009-06-01  Maxim Kuvyrkov  <maxim@codesourcery.com>
+	* calls.c (emit_library_call_value_1): Don't force_operand for move
+	and push insns.
+
 2009-06-01  Olivier Hainque  <hainque@adacore.com>
             Eric Botcazou  <botcazou@adacore.com>
 
diff --git a/gcc/calls.c b/gcc/calls.c
index 0d83ff4f38e28b0365df8b662f115748d3de8cb9..c10b0cd3abadb2f5b532997633031d53f5be3151 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -3412,6 +3412,11 @@ emit_library_call_value_1 (int retval, rtx orgfun, rtx value,
 
       nargs++;
 
+      /* Make sure it is a reasonable operand for a move or push insn.  */
+      if (!REG_P (addr) && !MEM_P (addr)
+	  && ! (CONSTANT_P (addr) && LEGITIMATE_CONSTANT_P (addr)))
+	addr = force_operand (addr, NULL_RTX);
+
       argvec[count].value = addr;
       argvec[count].mode = Pmode;
       argvec[count].partial = 0;
@@ -3447,6 +3452,11 @@ emit_library_call_value_1 (int retval, rtx orgfun, rtx value,
       gcc_assert (mode != BLKmode
 		  && (GET_MODE (val) == mode || GET_MODE (val) == VOIDmode));
 
+      /* Make sure it is a reasonable operand for a move or push insn.  */
+      if (!REG_P (val) && !MEM_P (val)
+	  && ! (CONSTANT_P (val) && LEGITIMATE_CONSTANT_P (val)))
+	val = force_operand (val, NULL_RTX);
+
       if (pass_by_reference (&args_so_far, mode, NULL_TREE, 1))
 	{
 	  rtx slot;