diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-01-30 08:14:20 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-01-30 08:14:20 +0000 |
| commit | ff3ac38ac11c642510816bf1e4bc3e46923bc80c (patch) | |
| tree | e5f65135f4cfc51c29981ddb7c31f2e06f73d1f7 | |
| parent | initial 4.15 patchset based on last 4.14 patchset (diff) | |
| download | gentoo-ff3ac38ac11c642510816bf1e4bc3e46923bc80c.tar.gz gentoo-ff3ac38ac11c642510816bf1e4bc3e46923bc80c.tar.bz2 gentoo-ff3ac38ac11c642510816bf1e4bc3e46923bc80c.zip | |
gdb/8.0.1: apply upstream patch that fixes build failure on ia64
Build failure:
nat/linux-ptrace.h:175:22: error: expected identifier before numeric constant
# define TRAP_HWBKPT 4
^
| -rw-r--r-- | src/patchsets/gdb/8.0.1/01_all_ia64-TRAP_HWBKPT.patch | 49 | ||||
| -rw-r--r-- | src/patchsets/gdb/8.0.1/README.history | 2 |
2 files changed, 51 insertions, 0 deletions
diff --git a/src/patchsets/gdb/8.0.1/01_all_ia64-TRAP_HWBKPT.patch b/src/patchsets/gdb/8.0.1/01_all_ia64-TRAP_HWBKPT.patch new file mode 100644 index 0000000000..bd098fb6b9 --- /dev/null +++ b/src/patchsets/gdb/8.0.1/01_all_ia64-TRAP_HWBKPT.patch @@ -0,0 +1,49 @@ +From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 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. +--- + gdb/nat/linux-ptrace.c | 2 -- + gdb/nat/linux-ptrace.h | 1 + + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c +index 5c4ddc9590..1f21ef03a3 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" + #ifdef HAVE_SYS_PROCFS_H + #include <sys/procfs.h> + #endif +diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h +index 60967a3b6a..dc180fbf82 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.16.1 + diff --git a/src/patchsets/gdb/8.0.1/README.history b/src/patchsets/gdb/8.0.1/README.history new file mode 100644 index 0000000000..143ca04ef3 --- /dev/null +++ b/src/patchsets/gdb/8.0.1/README.history @@ -0,0 +1,2 @@ +1 30 Jan 2018 + + 01_all_ia64-TRAP_HWBKPT.patch |