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) (From OE-Core rev: 463e512a027966123ec113b7507eb5e55a19b072) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
4b15cf9c62
commit
76ffc6b7e5
|
@ -16,6 +16,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
|
||||||
file://0009-Change-order-of-CFLAGS.patch \
|
file://0009-Change-order-of-CFLAGS.patch \
|
||||||
file://0010-resolve-restrict-keyword-conflict.patch \
|
file://0010-resolve-restrict-keyword-conflict.patch \
|
||||||
file://package_devel_gdb_patches_120-sigprocmask-invalid-call.patch \
|
file://package_devel_gdb_patches_120-sigprocmask-invalid-call.patch \
|
||||||
|
file://gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "193453347ddced7acb6b1cd2ee8f2e4b"
|
SRC_URI[md5sum] = "193453347ddced7acb6b1cd2ee8f2e4b"
|
||||||
SRC_URI[sha256sum] = "4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186"
|
SRC_URI[sha256sum] = "4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186"
|
||||||
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
From 49bd068c3acf376a3018c0ebd849bf7f72a1874d Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Clarke <jrtc27@jrtc27.com>
|
||||||
|
Date: Fri, 19 Jan 2018 17:22:49 +0000
|
||||||
|
Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
|
||||||
|
gdb_wait.h
|
||||||
|
|
||||||
|
On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
|
||||||
|
contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
|
||||||
|
define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
|
||||||
|
earlier; include it from linux-ptrace.h so it can never come afterwards.
|
||||||
|
|
||||||
|
gdb/ChangeLog:
|
||||||
|
|
||||||
|
* nat/linux-ptrace.c: Remove unnecessary reinclusion of
|
||||||
|
gdb_ptrace.h, and move including gdb_wait.h ...
|
||||||
|
* nat/linux-ptrace.h: ... to here.
|
||||||
|
|
||||||
|
Upstream-Status: Accepted [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
|
||||||
|
|
||||||
|
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
|
||||||
|
---
|
||||||
|
gdb/nat/linux-ptrace.c | 2 --
|
||||||
|
gdb/nat/linux-ptrace.h | 1 +
|
||||||
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
|
||||||
|
index 3447e07..dd3310e 100644
|
||||||
|
--- a/gdb/nat/linux-ptrace.c
|
||||||
|
+++ b/gdb/nat/linux-ptrace.c
|
||||||
|
@@ -21,8 +21,6 @@
|
||||||
|
#include "linux-procfs.h"
|
||||||
|
#include "linux-waitpid.h"
|
||||||
|
#include "buffer.h"
|
||||||
|
-#include "gdb_wait.h"
|
||||||
|
-#include "gdb_ptrace.h"
|
||||||
|
#include <sys/procfs.h>
|
||||||
|
|
||||||
|
/* Stores the ptrace options supported by the running kernel.
|
||||||
|
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
|
||||||
|
index 5954945..6faa89b 100644
|
||||||
|
--- a/gdb/nat/linux-ptrace.h
|
||||||
|
+++ b/gdb/nat/linux-ptrace.h
|
||||||
|
@@ -21,6 +21,7 @@
|
||||||
|
struct buffer;
|
||||||
|
|
||||||
|
#include "nat/gdb_ptrace.h"
|
||||||
|
+#include "gdb_wait.h"
|
||||||
|
|
||||||
|
#ifdef __UCLIBC__
|
||||||
|
#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
Loading…
Reference in New Issue