summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2018-03-02 22:23:34 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-06 06:43:11 -0800
commit4678ab168f78c90ffe33d7efab941ae3f6f6dbe5 (patch)
tree7dfa35815bad578f321ae257f9a89c11d2fc5fac /meta
parent23afd66b0122b450a3a8ae4cfa811214bff9f576 (diff)
downloadpoky-4678ab168f78c90ffe33d7efab941ae3f6f6dbe5.tar.gz
gdb: fix header ordering for TRAP_HWBKPT
This error can appear in gdb/nat/linux-ptrace.c because of the order in which some headers are processed: | In file included from ../../gdb-7.11.1/gdb/nat/linux-ptrace.c:20:0: | ../../gdb-7.11.1/gdb/nat/linux-ptrace.h:175:22: error: expected identifier before numeric constant | # define TRAP_HWBKPT 4 | ^ | Makefile:2357: recipe for target 'linux-ptrace.o' failed | make[2]: *** [linux-ptrace.o] Error 1 | make[2]: *** Waiting for unfinished jobs.... | make[2]: Leaving directory '/oe/build/tmp-rpb-glibc/work/aarch64-linaro-linux/gdb/7.11.1-r0/build-aarch64-linaro-linux/gdb' | Makefile:8822: recipe for target 'all-gdb' failed | make[1]: *** [all-gdb] Error 2 | make[1]: Leaving directory '/oe/build/tmp-rpb-glibc/work/aarch64-linaro-linux/gdb/7.11.1-r0/build-aarch64-linaro-linux' | Makefile:846: recipe for target 'all' failed | make: *** [all] Error 2 A patch from GDB's current master solves the issue. (From OE-Core rev: 4aaf747099714ec11158571527396ed9e818729e) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gdb/gdb-8.0.1.inc1
-rw-r--r--meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch51
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-8.0.1.inc b/meta/recipes-devtools/gdb/gdb-8.0.1.inc
index 83c08e55a3..4a5299b73f 100644
--- a/meta/recipes-devtools/gdb/gdb-8.0.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-8.0.1.inc
@@ -17,6 +17,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
17 file://0010-resolve-restrict-keyword-conflict.patch \ 17 file://0010-resolve-restrict-keyword-conflict.patch \
18 file://package_devel_gdb_patches_120-sigprocmask-invalid-call.patch \ 18 file://package_devel_gdb_patches_120-sigprocmask-invalid-call.patch \
19 file://0012-Unbreak-GDBserver-build-for-x32.patch \ 19 file://0012-Unbreak-GDBserver-build-for-x32.patch \
20 file://gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch \
20" 21"
21SRC_URI[md5sum] = "48cac527e6f3018b865ece021e9723ac" 22SRC_URI[md5sum] = "48cac527e6f3018b865ece021e9723ac"
22SRC_URI[sha256sum] = "3dbd5f93e36ba2815ad0efab030dcd0c7b211d7b353a40a53f4c02d7d56295e3" 23SRC_URI[sha256sum] = "3dbd5f93e36ba2815ad0efab030dcd0c7b211d7b353a40a53f4c02d7d56295e3"
diff --git a/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch b/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
new file mode 100644
index 0000000000..c7b1d0d902
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
@@ -0,0 +1,51 @@
1From b033a9663053eed87cb572397176747b88e9a699 Mon Sep 17 00:00:00 2001
2From: James Clarke <jrtc27@jrtc27.com>
3Date: Fri, 19 Jan 2018 17:22:49 +0000
4Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
5 gdb_wait.h
6
7On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
8contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
9define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
10earlier; include it from linux-ptrace.h so it can never come afterwards.
11
12gdb/ChangeLog:
13
14 * nat/linux-ptrace.c: Remove unnecessary reinclusion of
15 gdb_ptrace.h, and move including gdb_wait.h ...
16 * nat/linux-ptrace.h: ... to here.
17
18Upstream-Status: Accepted [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
19---
20 gdb/nat/linux-ptrace.c | 2 --
21 gdb/nat/linux-ptrace.h | 1 +
22 2 files changed, 1 insertion(+), 2 deletions(-)
23
24diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
25index 3265b16..559c2de 100644
26--- a/gdb/nat/linux-ptrace.c
27+++ b/gdb/nat/linux-ptrace.c
28@@ -21,8 +21,6 @@
29 #include "linux-procfs.h"
30 #include "linux-waitpid.h"
31 #include "buffer.h"
32-#include "gdb_wait.h"
33-#include "gdb_ptrace.h"
34 #ifdef HAVE_SYS_PROCFS_H
35 #include <sys/procfs.h>
36 #endif
37diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
38index 5954945..6faa89b 100644
39--- a/gdb/nat/linux-ptrace.h
40+++ b/gdb/nat/linux-ptrace.h
41@@ -21,6 +21,7 @@
42 struct buffer;
43
44 #include "nat/gdb_ptrace.h"
45+#include "gdb_wait.h"
46
47 #ifdef __UCLIBC__
48 #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
49--
502.7.4
51