summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-05-24 15:06:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-30 15:58:10 +0100
commita0acd705baa8de2687124cccc9647b74f4d75242 (patch)
tree1cb3dfdc84480f91036cfb135cf1bf74cbf7bbca /meta/recipes-devtools
parent899358a586f03daee8568c5d6906a5d992859264 (diff)
downloadpoky-a0acd705baa8de2687124cccc9647b74f4d75242.tar.gz
gcc: Backport nios2 gcc ICE fix
Backport a patch from mainline gcc 5 branch to fix ICE triggered when cross-compiling libdrm for nios2 architecture. The same ICE is fixed in gcc6 already. (From OE-Core rev: d603a6abf5abff2d1ccee902e0eb9f651aeb121e) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0061-nios2-Make-assert-less-restrictive.patch35
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.3.inc b/meta/recipes-devtools/gcc/gcc-5.3.inc
index 5dd8022430..c54fa68ab3 100644
--- a/meta/recipes-devtools/gcc/gcc-5.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.3.inc
@@ -90,6 +90,7 @@ SRC_URI = "\
90 file://0058-fdebug-prefix-map-support-to-remap-relative-path.patch \ 90 file://0058-fdebug-prefix-map-support-to-remap-relative-path.patch \
91 file://0059-libgcc-use-ldflags.patch \ 91 file://0059-libgcc-use-ldflags.patch \
92 file://0060-remove-prototypes-cfns.patch \ 92 file://0060-remove-prototypes-cfns.patch \
93 file://0061-nios2-Make-assert-less-restrictive.patch \
93 file://CVE-2016-4488.patch \ 94 file://CVE-2016-4488.patch \
94 file://CVE-2016-4489.patch \ 95 file://CVE-2016-4489.patch \
95 file://CVE-2016-2226.patch \ 96 file://CVE-2016-2226.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0061-nios2-Make-assert-less-restrictive.patch b/meta/recipes-devtools/gcc/gcc-5.3/0061-nios2-Make-assert-less-restrictive.patch
new file mode 100644
index 0000000000..6a20694e44
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0061-nios2-Make-assert-less-restrictive.patch
@@ -0,0 +1,35 @@
1From 802c64857074cb7b002d91ce6352139c2353ca06 Mon Sep 17 00:00:00 2001
2From: cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Sat, 21 May 2016 08:26:11 +0000
4Subject: [PATCH] 2016-05-21 Chung-Lin Tang <cltang@codesourcery.com>
5
6 Backport from mainline
7 2015-06-29 Sandra Loosemore <sandra@codesourcery.com>
8
9 * config/nios2/nios2.c (nios2_delegitimize_address): Make
10 assert less restrictive.
11
12
13
14git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@236555 138bc75d-0d04-0410-961f-82ee72b054a4
15Upstream-Status: Backport (git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@236555 138bc75d-0d04-0410-961f-82ee72b054a4)
16---
17 gcc/config/nios2/nios2.c | 2 +-
18 1 files changed, 1 insertions(+), 1 deletion(-)
19
20diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
21index 7b6b389..3b22331 100644
22--- a/gcc/config/nios2/nios2.c
23+++ b/gcc/config/nios2/nios2.c
24@@ -1930,7 +1930,7 @@ nios2_delegitimize_address (rtx x)
25 case UNSPEC_LOAD_TLS_IE:
26 case UNSPEC_ADD_TLS_LE:
27 x = XVECEXP (XEXP (x, 0), 0, 0);
28- gcc_assert (GET_CODE (x) == SYMBOL_REF);
29+ gcc_assert (CONSTANT_P (x));
30 break;
31 }
32 }
33--
342.8.1
35