diff options
author | ramana <ramana@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-11 09:38:14 +0000 |
---|---|---|
committer | ramana <ramana@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-11 09:38:14 +0000 |
commit | d8e03d55d2e9801086aa8da2f9c347510aef8e11 (patch) | |
tree | 843c65084e950268e5dd2489a46de39ba5517831 | |
parent | 3e09bc82dc951f6a424b4fd1726abdf9633a045d (diff) | |
download | gcc-d8e03d55d2e9801086aa8da2f9c347510aef8e11.tar.gz |
Backport fix for PR target/58854
2013-11-11 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
Backported from mainline
2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
PR target/58854
* config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit blockage
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@204665 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/config/arm/arm.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c9e0feee51f..1174501fcf7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2013-11-11 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> + + Backported from mainline + 2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> + + PR target/58854 + * config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit blockage + 2013-11-11 Jakub Jelinek <jakub@redhat.com> Backported from mainline diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index d787a6e80c2..52871f163f9 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -23555,6 +23555,7 @@ arm_expand_epilogue_apcs_frame (bool really_return) num_regs = bit_count (saved_regs_mask); if ((offsets->outgoing_args != (1 + num_regs)) || cfun->calls_alloca) { + emit_insn (gen_blockage ()); /* Unwind the stack to just below the saved registers. */ emit_insn (gen_addsi3 (stack_pointer_rtx, hard_frame_pointer_rtx, |