[oe-commits] Joe Slater : gdb: allow compilation for __aarch64__

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: dd776e2aacb4e75f2195b8943a9594131592a0da
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dd776e2aacb4e75f2195b8943a9594131592a0da

Author: Joe Slater <jslater at windriver.com>
Date:   Tue Sep  9 11:59:38 2014 -0700

gdb: allow compilation for __aarch64__

asm/ptrace.h must be included in two files.

Signed-off-by: Joe Slater <jslater at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/gdb/gdb.inc                  |  1 +
 .../gdb/gdb/include_asm_ptrace.patch               | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 3321a24..7b3e59a 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -5,6 +5,7 @@ inherit gettext
 SRC_URI += "file://kill_arm_map_symbols.patch \
             file://gdbserver-cflags-last.diff;striplevel=0 \
             file://renesas-sh-native-support.patch \
+            file://include_asm_ptrace.patch \
            "
 #LDFLAGS_append = " -s"
 #export CFLAGS_append=" -L${STAGING_LIBDIR}"
diff --git a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch b/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch
new file mode 100644
index 0000000..85e0147
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch
@@ -0,0 +1,30 @@
+gdb: include asm/ptrace.h in two aarch64 source files
+
+Both sys/ptrace.h and asm/ptrace.h need to be included.
+
+Upstream-Status: Pending
+
+Signed-off-by: joe.slater at windriver.com
+
+
+--- a/gdb/aarch64-linux-nat.c
++++ b/gdb/aarch64-linux-nat.c
+@@ -32,6 +32,8 @@
+ #include "elf/common.h"
+ 
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
++
+ #include <sys/utsname.h>
+ 
+ #include "gregset.h"
+--- a/gdb/gdbserver/linux-aarch64-low.c
++++ b/gdb/gdbserver/linux-aarch64-low.c
+@@ -26,6 +26,7 @@
+ #include <signal.h>
+ #include <sys/user.h>
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
+ #include <sys/uio.h>
+ 
+ #include "gdb_proc_service.h"