diff options
| author | Ben Cheng <bccheng@google.com> | 2013-10-30 11:26:24 -0700 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2013-10-30 16:53:32 -0700 |
| commit | 12b4a6e3ccdbfeb64092ff97fd08f72c71dbf788 (patch) | |
| tree | 53cad7264e12d58ff88bfae5ede5e4723c8cb2de /gcc-4.8 | |
| parent | 1c712bf7621f3859c33fd3afaa61fdcaf3fdfd76 (diff) | |
| download | toolchain_gcc-12b4a6e3ccdbfeb64092ff97fd08f72c71dbf788.tar.gz toolchain_gcc-12b4a6e3ccdbfeb64092ff97fd08f72c71dbf788.tar.bz2 toolchain_gcc-12b4a6e3ccdbfeb64092ff97fd08f72c71dbf788.zip | |
[4.8] Backport revision 204203 to fix 3.4 kernel compilation.
2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
PR target/58854
* config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit
* blockage.
Change-Id: I6edddcf212f4185ab55a3a17bc7a80b1ab6b64b7
Diffstat (limited to 'gcc-4.8')
| -rw-r--r-- | gcc-4.8/ChangeLog.backported | 5 | ||||
| -rw-r--r-- | gcc-4.8/gcc/config/arm/arm.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc-4.8/ChangeLog.backported b/gcc-4.8/ChangeLog.backported index 0b025f682..b585806de 100644 --- a/gcc-4.8/ChangeLog.backported +++ b/gcc-4.8/ChangeLog.backported @@ -1,3 +1,8 @@ +http://gcc.gnu.org/viewcvs/gcc?view=revision&revision=204203 +2013-10-30 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> + PR target/58854 + * config/arm/arm.c (arm_expand_epilogue_apcs_frame): Emit blockage. + http://gcc.gnu.org/viewcvs/gcc?view=rev&rev=201780 2013-08-16 Jakub Jelinek <jakub@redhat.com> diff --git a/gcc-4.8/gcc/config/arm/arm.c b/gcc-4.8/gcc/config/arm/arm.c index 155a52082..6893cf32c 100644 --- a/gcc-4.8/gcc/config/arm/arm.c +++ b/gcc-4.8/gcc/config/arm/arm.c @@ -23537,6 +23537,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, |