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>

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 = "\
            file://0058-fdebug-prefix-map-support-to-remap-relative-path.patch \
            file://0059-libgcc-use-ldflags.patch \
            file://0060-remove-prototypes-cfns.patch \
+           file://0061-nios2-Make-assert-less-restrictive.patch \
            file://CVE-2016-4488.patch \
            file://CVE-2016-4489.patch \
            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 @@
+From 802c64857074cb7b002d91ce6352139c2353ca06 Mon Sep 17 00:00:00 2001
+From: cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 21 May 2016 08:26:11 +0000
+Subject: [PATCH] 2016-05-21  Chung-Lin Tang  <cltang@codesourcery.com>
+
+        Backport from mainline
+        2015-06-29  Sandra Loosemore  <sandra@codesourcery.com>
+
+        * config/nios2/nios2.c (nios2_delegitimize_address): Make
+        assert less restrictive.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@236555 138bc75d-0d04-0410-961f-82ee72b054a4
+Upstream-Status: Backport (git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@236555 138bc75d-0d04-0410-961f-82ee72b054a4)
+---
+ gcc/config/nios2/nios2.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
+index 7b6b389..3b22331 100644
+--- a/gcc/config/nios2/nios2.c
++++ b/gcc/config/nios2/nios2.c
+@@ -1930,7 +1930,7 @@ nios2_delegitimize_address (rtx x)
+        case UNSPEC_LOAD_TLS_IE:
+        case UNSPEC_ADD_TLS_LE:
+          x = XVECEXP (XEXP (x, 0), 0, 0);
+-         gcc_assert (GET_CODE (x) == SYMBOL_REF);
++         gcc_assert (CONSTANT_P (x));
+          break;
+        }
+     }
+-- 
+2.8.1
+