diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5aaad73fc40bb0ca5d428f07f03dc974aaeeb9b3..f9b074459de14a2db8eadfbf81be72a777cc57e8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-06  Richard Henderson  <rth@redhat.com>
+
+	* cfganal.c (keep_with_call_p): Source for fixed_reg dest must
+	be a general_operand.  Dest for function value must be a pseudo.
+
 2002-02-06  Nick Clifton  <nickc@cambridge.redhat.com>
 
 	* dbxout.c (dbxout_symbol_location): Accept LABEL_REFs as well
diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index 6a10236dfc97e74e66513908ea69bb7c3598cfd3..17db86e2a2cf4940284e5148b59501c168b04db3 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -224,10 +224,13 @@ keep_with_call_p (insn)
   if (INSN_P (insn) && (set = single_set (insn)) != NULL)
     {
       if (GET_CODE (SET_DEST (set)) == REG
-	  && fixed_regs[REGNO (SET_DEST (set))])
+	  && fixed_regs[REGNO (SET_DEST (set))]
+	  && general_operand (SET_SRC (set)))
 	return true;
       if (GET_CODE (SET_SRC (set)) == REG
-	  && FUNCTION_VALUE_REGNO_P (REGNO (SET_SRC (set))))
+	  && FUNCTION_VALUE_REGNO_P (REGNO (SET_SRC (set)))
+	  && GET_CODE (SET_DEST (set)) == REG
+	  && REGNO (SET_DEST (set)) >= FIRST_PSEUDO_REGISTER)
 	return true;
     }
   return false;