(expand_function_start): Only use static_chain_incoming_rtx once if it

is a REG and we have SMALL_REGISTER_CLASSES.

From-SVN: r7873

diff --git a/gcc/function.c b/gcc/function.c
index 4650548d22aaa0f757c70cc7f7e8394a01654a84..e482f1da4814a6f8c6ba1c590dc8a2737036a4b9 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4965,11 +4965,20 @@ expand_function_start (subr, parms_have_cleanups)
 
   /* Fetch static chain values for containing functions.  */
   tem = decl_function_context (current_function_decl);
-  /* If not doing stupid register allocation, then start off with the static
-     chain pointer in a pseudo register.  Otherwise, we use the stack
-     address that was generated above.  */
+  /* If not doing stupid register allocation copy the static chain
+     pointer into a psuedo.  If we have small register classes, copy the
+     value from memory if static_chain_incoming_rtx is a REG.  If we do
+     stupid register allocation, we use the stack address generated above.  */
   if (tem && ! obey_regdecls)
-    last_ptr = copy_to_reg (static_chain_incoming_rtx);
+    {
+#ifdef SMALL_REGISTER_CLASSES
+      if (GET_CODE (static_chain_incoming_rtx) == REG)
+       last_ptr = copy_to_reg (last_ptr);
+      else
+#endif
+       last_ptr = copy_to_reg (static_chain_incoming_rtx);
+    }
+
   context_display = 0;
   while (tem)
     {