diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8/0037-gcc-4.8-PR56797.patch | 66 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.9.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.9/0037-gcc-4.8-PR56797.patch | 66 |
4 files changed, 0 insertions, 134 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 80a3fc4d77..dbe1ba6ee0 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc | |||
@@ -59,7 +59,6 @@ SRC_URI = "\ | |||
59 | file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ | 59 | file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ |
60 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ | 60 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ |
61 | file://0035-wcast-qual-PR-55383.patch \ | 61 | file://0035-wcast-qual-PR-55383.patch \ |
62 | file://0037-gcc-4.8-PR56797.patch \ | ||
63 | file://0038-gcc-4.8-build-args.patch \ | 62 | file://0038-gcc-4.8-build-args.patch \ |
64 | file://0039-gcc-4.8-PR57717.patch \ | 63 | file://0039-gcc-4.8-PR57717.patch \ |
65 | file://0040-fix-g++-sysroot.patch \ | 64 | file://0040-fix-g++-sysroot.patch \ |
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0037-gcc-4.8-PR56797.patch b/meta/recipes-devtools/gcc/gcc-4.8/0037-gcc-4.8-PR56797.patch deleted file mode 100644 index b5d7b864fd..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0037-gcc-4.8-PR56797.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
3 | |||
4 | From patchwork Fri Apr 19 09:34:49 2013 | ||
5 | Content-Type: text/plain; charset="utf-8" | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Transfer-Encoding: 7bit | ||
8 | Subject: [ARM] Fix PR56797 | ||
9 | Date: Thu, 18 Apr 2013 23:34:49 -0000 | ||
10 | From: Greta Yorsh <Greta.Yorsh@arm.com> | ||
11 | X-Patchwork-Id: 237891 | ||
12 | Message-Id: <000801ce3ce1$23fbdd60$6bf39820$@yorsh@arm.com> | ||
13 | To: "GCC Patches" <gcc-patches@gcc.gnu.org> | ||
14 | Cc: <raj.khem@gmail.com>, "Richard Earnshaw" <Richard.Earnshaw@arm.com>, | ||
15 | "Ramana Radhakrishnan" <Ramana.Radhakrishnan@arm.com> | ||
16 | |||
17 | Fix PR56797 | ||
18 | http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56797 | ||
19 | |||
20 | The problem is that peephole optimizer thinks it can generate an ldm, but | ||
21 | the pattern for ldm no longer matches, because after r188738 it requires | ||
22 | that if one of the destination registers is SP then the base register must | ||
23 | be SP, and it's not SP in the test case. | ||
24 | |||
25 | The test case fails on armv5t but doesn't fail on armv6t2 or armv7-a because | ||
26 | peephole doesn't trigger there (because there is a different epilogue | ||
27 | sequence). It looks like a latent problem for other architecture or CPUs. | ||
28 | |||
29 | This patch adds this condition to the peephole optimizer. | ||
30 | |||
31 | No regression on qemu for arm-none-eabi and fixes the test reported in the | ||
32 | PR. I couldn't minimize the test sufficiently to include it in the | ||
33 | testsuite. | ||
34 | |||
35 | Ok for trunk? | ||
36 | |||
37 | Thanks, | ||
38 | Greta | ||
39 | |||
40 | gcc/ | ||
41 | |||
42 | 2013-04-18 Greta Yorsh <Greta.Yorsh@arm.com> | ||
43 | |||
44 | PR target/56797 | ||
45 | * config/arm/arm.c (load_multiple_sequence): Require SP | ||
46 | as base register for loads if SP is in the register list. | ||
47 | |||
48 | |||
49 | diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c | ||
50 | index d00849c..60fef78 100644 | ||
51 | --- a/gcc/config/arm/arm.c | ||
52 | +++ b/gcc/config/arm/arm.c | ||
53 | @@ -10347,6 +10347,13 @@ load_multiple_sequence (rtx *operands, int nops, int *regs, int *saved_order, | ||
54 | || (i != nops - 1 && unsorted_regs[i] == base_reg)) | ||
55 | return 0; | ||
56 | |||
57 | + /* Don't allow SP to be loaded unless it is also the base | ||
58 | + register. It guarantees that SP is reset correctly when | ||
59 | + an LDM instruction is interruptted. Otherwise, we might | ||
60 | + end up with a corrupt stack. */ | ||
61 | + if (unsorted_regs[i] == SP_REGNUM && base_reg != SP_REGNUM) | ||
62 | + return 0; | ||
63 | + | ||
64 | unsorted_offsets[i] = INTVAL (offset); | ||
65 | if (i == 0 || unsorted_offsets[i] < unsorted_offsets[order[0]]) | ||
66 | order[0] = i; | ||
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 5a1c0281d9..01dfde16a2 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc | |||
@@ -58,7 +58,6 @@ SRC_URI = "\ | |||
58 | file://0032-libtool.patch \ | 58 | file://0032-libtool.patch \ |
59 | file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ | 59 | file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ |
60 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ | 60 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ |
61 | file://0037-gcc-4.8-PR56797.patch \ | ||
62 | file://0040-fix-g++-sysroot.patch \ | 61 | file://0040-fix-g++-sysroot.patch \ |
63 | file://0041-libtool-avoid-libdir.patch \ | 62 | file://0041-libtool-avoid-libdir.patch \ |
64 | file://0043-cpp.patch \ | 63 | file://0043-cpp.patch \ |
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0037-gcc-4.8-PR56797.patch b/meta/recipes-devtools/gcc/gcc-4.9/0037-gcc-4.8-PR56797.patch deleted file mode 100644 index b5d7b864fd..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.9/0037-gcc-4.8-PR56797.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
3 | |||
4 | From patchwork Fri Apr 19 09:34:49 2013 | ||
5 | Content-Type: text/plain; charset="utf-8" | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Transfer-Encoding: 7bit | ||
8 | Subject: [ARM] Fix PR56797 | ||
9 | Date: Thu, 18 Apr 2013 23:34:49 -0000 | ||
10 | From: Greta Yorsh <Greta.Yorsh@arm.com> | ||
11 | X-Patchwork-Id: 237891 | ||
12 | Message-Id: <000801ce3ce1$23fbdd60$6bf39820$@yorsh@arm.com> | ||
13 | To: "GCC Patches" <gcc-patches@gcc.gnu.org> | ||
14 | Cc: <raj.khem@gmail.com>, "Richard Earnshaw" <Richard.Earnshaw@arm.com>, | ||
15 | "Ramana Radhakrishnan" <Ramana.Radhakrishnan@arm.com> | ||
16 | |||
17 | Fix PR56797 | ||
18 | http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56797 | ||
19 | |||
20 | The problem is that peephole optimizer thinks it can generate an ldm, but | ||
21 | the pattern for ldm no longer matches, because after r188738 it requires | ||
22 | that if one of the destination registers is SP then the base register must | ||
23 | be SP, and it's not SP in the test case. | ||
24 | |||
25 | The test case fails on armv5t but doesn't fail on armv6t2 or armv7-a because | ||
26 | peephole doesn't trigger there (because there is a different epilogue | ||
27 | sequence). It looks like a latent problem for other architecture or CPUs. | ||
28 | |||
29 | This patch adds this condition to the peephole optimizer. | ||
30 | |||
31 | No regression on qemu for arm-none-eabi and fixes the test reported in the | ||
32 | PR. I couldn't minimize the test sufficiently to include it in the | ||
33 | testsuite. | ||
34 | |||
35 | Ok for trunk? | ||
36 | |||
37 | Thanks, | ||
38 | Greta | ||
39 | |||
40 | gcc/ | ||
41 | |||
42 | 2013-04-18 Greta Yorsh <Greta.Yorsh@arm.com> | ||
43 | |||
44 | PR target/56797 | ||
45 | * config/arm/arm.c (load_multiple_sequence): Require SP | ||
46 | as base register for loads if SP is in the register list. | ||
47 | |||
48 | |||
49 | diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c | ||
50 | index d00849c..60fef78 100644 | ||
51 | --- a/gcc/config/arm/arm.c | ||
52 | +++ b/gcc/config/arm/arm.c | ||
53 | @@ -10347,6 +10347,13 @@ load_multiple_sequence (rtx *operands, int nops, int *regs, int *saved_order, | ||
54 | || (i != nops - 1 && unsorted_regs[i] == base_reg)) | ||
55 | return 0; | ||
56 | |||
57 | + /* Don't allow SP to be loaded unless it is also the base | ||
58 | + register. It guarantees that SP is reset correctly when | ||
59 | + an LDM instruction is interruptted. Otherwise, we might | ||
60 | + end up with a corrupt stack. */ | ||
61 | + if (unsorted_regs[i] == SP_REGNUM && base_reg != SP_REGNUM) | ||
62 | + return 0; | ||
63 | + | ||
64 | unsorted_offsets[i] = INTVAL (offset); | ||
65 | if (i == 0 || unsorted_offsets[i] < unsorted_offsets[order[0]]) | ||
66 | order[0] = i; | ||