Merge lp:~uweigand/gcc-linaro/lp-617384-4.4 into lp:gcc-linaro/4.4

[Ulrich Weigand]

Fix LP #617384.

=== modified file 'ChangeLog.linaro'
--- ChangeLog.linaro	2010-12-10 13:50:05 +0000
+++ ChangeLog.linaro	2010-12-21 14:47:37 +0000
@@ -1,3 +1,11 @@
[phone]  Ulrich Weigand  <[e-mail]>
+
+	LP: #617384
+	Backport from mainline:
+
+	* config/arm/arm.c (require_pic_register): Set INSN_LOCATOR for all
+	instructions injected into the prologue to prologue_locator.
+
 2010-12-10  Andrew Stubbs  <[e-mail]>
 
 	gcc/
 
=== modified file 'gcc/config/arm/arm.c'
--- gcc/config/arm/arm.c	2010-09-07 14:49:43 +0000
+++ gcc/config/arm/arm.c	2010-12-21 14:47:37 +0000
@@ -4856,7 +4856,7 @@
 	}
       else
 	{
-	  rtx seq;
+	  rtx seq, insn;
 
 	  if (!cfun->machine->pic_reg)
 	    cfun->machine->pic_reg = gen_reg_rtx (Pmode);
@@ -4873,6 +4873,11 @@
 
 	      seq = get_insns ();
 	      end_sequence ();
+
+	      for (insn = seq; insn; insn = NEXT_INSN (insn))
+		if (INSN_P (insn))
+		  INSN_LOCATOR (insn) = prologue_locator;
+
 	      emit_insn_after (seq, entry_of_function ());
 	    }
 	}