summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-09 20:55:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commit70d20398c48ce18823b0117079f2fdc04043a092 (patch)
treeca0414bcc1477601794aa0a13a3f4a3024e2d840 /meta
parent1aff4b01aa9517072a01671ca768738b080cc9bb (diff)
downloadpoky-70d20398c48ce18823b0117079f2fdc04043a092.tar.gz
gcc: drop patch that is already upstream
Due to patch fuzz, it was applied again, so the same code sequence was repeated twice. Not sure if that caused any bugs, but certainly wasn't the right thing to do. (From OE-Core rev: e3a50788bfeabbde226e280803a01dd7f765b2bc) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-7.3.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-7.3/0050-RISC-V-Handle-non-legitimate-address-in-riscv_legiti.patch51
2 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc
index 5d3b8d7ec3..d56d2c5e06 100644
--- a/meta/recipes-devtools/gcc/gcc-7.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-7.3.inc
@@ -73,7 +73,6 @@ SRC_URI = "\
73 file://0047-sync-gcc-stddef.h-with-musl.patch \ 73 file://0047-sync-gcc-stddef.h-with-musl.patch \
74 file://0048-gcc-Enable-static-PIE.patch \ 74 file://0048-gcc-Enable-static-PIE.patch \
75 file://fix-segmentation-fault-precompiled-hdr.patch \ 75 file://fix-segmentation-fault-precompiled-hdr.patch \
76 file://0050-RISC-V-Handle-non-legitimate-address-in-riscv_legiti.patch \
77 file://no-sse-fix-test-case-failures.patch \ 76 file://no-sse-fix-test-case-failures.patch \
78 ${BACKPORTS} \ 77 ${BACKPORTS} \
79" 78"
diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0050-RISC-V-Handle-non-legitimate-address-in-riscv_legiti.patch b/meta/recipes-devtools/gcc/gcc-7.3/0050-RISC-V-Handle-non-legitimate-address-in-riscv_legiti.patch
deleted file mode 100644
index 5a14d04b6f..0000000000
--- a/meta/recipes-devtools/gcc/gcc-7.3/0050-RISC-V-Handle-non-legitimate-address-in-riscv_legiti.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 16210e6270e200cd4892a90ecef608906be3a130 Mon Sep 17 00:00:00 2001
2From: Kito Cheng <kito.cheng@gmail.com>
3Date: Thu, 4 May 2017 02:11:13 +0800
4Subject: [PATCH] RISC-V: Handle non-legitimate address in
5 riscv_legitimize_move
6
7GCC may generate non-legitimate address due to we allow some
8load/store with non-legitimate address in pic.md.
9
10 2017-05-12 Kito Cheng <kito.cheng@gmail.com>
11
12 * config/riscv/riscv.c (riscv_legitimize_move): Handle
13 non-legitimate address.
14---
15Upstream-Status: Backport
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17
18 gcc/ChangeLog | 5 +++++
19 gcc/config/riscv/riscv.c | 16 ++++++++++++++++
20 2 files changed, 21 insertions(+)
21
22diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
23index f7fec4bfcf8..d519be1659a 100644
24--- a/gcc/config/riscv/riscv.c
25+++ b/gcc/config/riscv/riscv.c
26@@ -1385,6 +1385,22 @@ riscv_legitimize_move (enum machine_mode mode, rtx dest, rtx src)
27 return true;
28 }
29
30+ /* RISC-V GCC may generate non-legitimate address due to we provide some
31+ pattern for optimize access PIC local symbol and it's make GCC generate
32+ unrecognizable instruction during optmizing. */
33+
34+ if (MEM_P (dest) && !riscv_legitimate_address_p (mode, XEXP (dest, 0),
35+ reload_completed))
36+ {
37+ XEXP (dest, 0) = riscv_force_address (XEXP (dest, 0), mode);
38+ }
39+
40+ if (MEM_P (src) && !riscv_legitimate_address_p (mode, XEXP (src, 0),
41+ reload_completed))
42+ {
43+ XEXP (src, 0) = riscv_force_address (XEXP (src, 0), mode);
44+ }
45+
46 return false;
47 }
48
49--
502.14.2
51