diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 47c56942e7ea..23ba6cf8cdd0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-16  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* calls.c (emit_library_call_value_1): Don't refer to
+	hard_libcall_value.
+	* optabs.c (prepare_float_lib_cmp): Likewise.
+
 2002-09-16  Geoffrey Keating  <geoffk@apple.com>
 
 	* ggc-common.c (ggc_mark_rtx_children_1): Update for changed name
diff --git a/gcc/calls.c b/gcc/calls.c
index 378c54f0ec2d..665868f8e03a 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -4148,9 +4148,9 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p)
 	    emit_move_insn (value, mem_value);
 	}
       else if (value != 0)
-	emit_move_insn (value, hard_libcall_value (outmode));
+	emit_move_insn (value, valreg);
       else
-	value = hard_libcall_value (outmode);
+	value = valreg;
     }
 
   if (ACCUMULATE_OUTGOING_ARGS)
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 01121714692d..7ceec122ff1e 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -4006,14 +4006,9 @@ prepare_float_lib_cmp (px, py, pcomparison, pmode, punsignedp)
   if (libfunc == 0)
     abort ();
 
-  emit_library_call (libfunc, LCT_CONST_MAKE_BLOCK, word_mode, 2, x, mode, y,
-		     mode);
-
-  /* Immediately move the result of the libcall into a pseudo
-     register so reload doesn't clobber the value if it needs
-     the return register for a spill reg.  */
   result = gen_reg_rtx (word_mode);
-  emit_move_insn (result, hard_libcall_value (word_mode));
+  emit_library_call_value (libfunc, result, LCT_CONST_MAKE_BLOCK,
+			   word_mode, 2, x, mode, y, mode);
   *px = result;
   *py = const0_rtx;
   *pmode = word_mode;