diff options
author | Joe Slater <jslater@windriver.com> | 2014-09-09 11:59:38 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-10 11:33:26 +0100 |
commit | a4256395800b49fd6ca5bf52b282a89218afeb0c (patch) | |
tree | 0d38fe05636d6da5a2ae6b20165020f875e6eb2e | |
parent | 5bef32283f53e7f1bbde81fbb95c8682e29f082a (diff) | |
download | poky-a4256395800b49fd6ca5bf52b282a89218afeb0c.tar.gz |
gdb: allow compilation for __aarch64__
asm/ptrace.h must be included in two files.
(From OE-Core rev: dd776e2aacb4e75f2195b8943a9594131592a0da)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/gdb/gdb.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 3321a244e8..7b3e59af62 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc | |||
@@ -5,6 +5,7 @@ inherit gettext | |||
5 | SRC_URI += "file://kill_arm_map_symbols.patch \ | 5 | SRC_URI += "file://kill_arm_map_symbols.patch \ |
6 | file://gdbserver-cflags-last.diff;striplevel=0 \ | 6 | file://gdbserver-cflags-last.diff;striplevel=0 \ |
7 | file://renesas-sh-native-support.patch \ | 7 | file://renesas-sh-native-support.patch \ |
8 | file://include_asm_ptrace.patch \ | ||
8 | " | 9 | " |
9 | #LDFLAGS_append = " -s" | 10 | #LDFLAGS_append = " -s" |
10 | #export CFLAGS_append=" -L${STAGING_LIBDIR}" | 11 | #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 0000000000..85e0147665 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | gdb: include asm/ptrace.h in two aarch64 source files | ||
2 | |||
3 | Both sys/ptrace.h and asm/ptrace.h need to be included. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: joe.slater@windriver.com | ||
8 | |||
9 | |||
10 | --- a/gdb/aarch64-linux-nat.c | ||
11 | +++ b/gdb/aarch64-linux-nat.c | ||
12 | @@ -32,6 +32,8 @@ | ||
13 | #include "elf/common.h" | ||
14 | |||
15 | #include <sys/ptrace.h> | ||
16 | +#include <asm/ptrace.h> | ||
17 | + | ||
18 | #include <sys/utsname.h> | ||
19 | |||
20 | #include "gregset.h" | ||
21 | --- a/gdb/gdbserver/linux-aarch64-low.c | ||
22 | +++ b/gdb/gdbserver/linux-aarch64-low.c | ||
23 | @@ -26,6 +26,7 @@ | ||
24 | #include <signal.h> | ||
25 | #include <sys/user.h> | ||
26 | #include <sys/ptrace.h> | ||
27 | +#include <asm/ptrace.h> | ||
28 | #include <sys/uio.h> | ||
29 | |||
30 | #include "gdb_proc_service.h" | ||