(movsi): If -mno-sum-in-toc, do addition of symbol + const.

From-SVN: r6635

gcc/config/rs6000/rs6000.md

@@ -2844,6 +2844,25 @@
   if (CONSTANT_P (operands[1]) && GET_CODE (operands[1]) != CONST_INT
       && ! LEGITIMATE_CONSTANT_POOL_ADDRESS_P (operands[1]))
     {
+      /* If we are to limit the number of things we put in the TOC and
+	 this is a symbol plus a constant we can add in one insn,
+	 just put the sumbol in the TOC and add the constant.  Don't do
+	 this if reload is in progress.  */
+      if (GET_CODE (operands[1]) == CONST
+	  && TARGET_NO_SUM_IN_TOC && ! reload_in_progress
+	  && GET_CODE (XEXP (operands[1], 0)) == PLUS
+	  && add_operand (XEXP (XEXP (operands[1], 0), 1), SImode)
+	  && (GET_CODE (XEXP (XEXP (operands[1], 0), 0)) == LABEL_REF
+	      || GET_CODE (XEXP (XEXP (operands[1], 0), 0)) == SYMBOL_REF)
+	  && ! side_effects_p (operands[0]))
+	{
+	  rtx sym = force_const_mem (SImode, XEXP (XEXP (operands[1], 0), 0));
+	  rtx other = XEXP (XEXP (operands[1], 0), 1);
+
+	  emit_insn (gen_addsi3 (operands[0], force_reg (SImode, sym), other));
+	  DONE;
+	}
+
       operands[1] = force_const_mem (SImode, operands[1]);
       if (! memory_address_p (SImode, XEXP (operands[1], 0))
 	  && ! reload_in_progress)