gdb 7.12: fix armv8b build

Backport fix from GDB upstream to fix big-endian aarch64 build.

(From OE-Core rev: 0635a96d82f5f5dd65a2d45ddca7559dea847916)

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 44 insertions, 0 deletions

diff --git a/meta/recipes-devtools/gdb/gdb-7.12.inc b/meta/recipes-devtools/gdb/gdb-7.12.inc
index 2faddc58bf..7eea65f4fa 100644
--- a/meta/recipes-devtools/gdb/gdb-7.12.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.12.inc
@@ -15,6 +15,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
            file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \
            file://0009-Change-order-of-CFLAGS.patch \
            file://0010-resolve-restrict-keyword-conflict.patch \
+           file://cb93dc7f262978bafe36397a41a56e409a302042.patch \
 "
 SRC_URI[md5sum] = "a0a3a00f7499b0c5278ba8676745d180"
 SRC_URI[sha256sum] = "834ff3c5948b30718343ea57b11cbc3235d7995c6a4f3a5cecec8c8114164f94"
diff --git a/meta/recipes-devtools/gdb/gdb/cb93dc7f262978bafe36397a41a56e409a302042.patch b/meta/recipes-devtools/gdb/gdb/cb93dc7f262978bafe36397a41a56e409a302042.patch
new file mode 100644
index 0000000000..3a42f0a770
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/cb93dc7f262978bafe36397a41a56e409a302042.patch
@@ -0,0 +1,43 @@
+From cb93dc7f262978bafe36397a41a56e409a302042 Mon Sep 17 00:00:00 2001
+From: Yao Qi <yao.qi@linaro.org>
+Date: Mon, 24 Oct 2016 10:59:11 +0100
+Subject: [PATCH] [GDBserver] Fix conversion warning
+
+I got the following warning if I build GDBserver for aarch64_be-linux-gnu,
+
+git/gdb/gdbserver/linux-aarch64-low.c:1539:39: error: invalid conversion from 'void*' to 'uint32_t* {aka unsigned int*}' [-fpermissive]
+   uint32_t *le_buf = xmalloc (byte_len);
+                                       ^
+The patch is to fix the warning.
+
+gdb/gdbserver:
+
+2016-10-24  Yao Qi  <yao.qi@linaro.org>
+
+        PR server/20733
+        * linux-aarch64-low.c (append_insns): Cast the return value to
+        'uint32_t *'.
+
+Upstream-status: Backport
+Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
+
+---
+ gdb/gdbserver/linux-aarch64-low.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
+index e54a8ba..ae80cdd 100644
+--- a/gdb/gdbserver/linux-aarch64-low.c
++++ b/gdb/gdbserver/linux-aarch64-low.c
+@@ -1536,7 +1536,7 @@ append_insns (CORE_ADDR *to, size_t len, const uint32_t *buf)
+ {
+   size_t byte_len = len * sizeof (uint32_t);
+ #if (__BYTE_ORDER == __BIG_ENDIAN)
+-  uint32_t *le_buf = xmalloc (byte_len);
++  uint32_t *le_buf = (uint32_t *) xmalloc (byte_len);
+   size_t i;
+ 
+   for (i = 0; i < len; i++)
+-- 
+2.9.3
+