1 |
slyfox 18/01/30 08:14:20 |
2 |
|
3 |
Added: 01_all_ia64-TRAP_HWBKPT.patch README.history |
4 |
Log: |
5 |
gdb/8.0.1: apply upstream patch that fixes build failure on ia64 |
6 |
|
7 |
Build failure: |
8 |
nat/linux-ptrace.h:175:22: error: expected identifier before numeric constant |
9 |
# define TRAP_HWBKPT 4 |
10 |
^ |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 src/patchsets/gdb/8.0.1/01_all_ia64-TRAP_HWBKPT.patch |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gdb/8.0.1/01_all_ia64-TRAP_HWBKPT.patch?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gdb/8.0.1/01_all_ia64-TRAP_HWBKPT.patch?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: 01_all_ia64-TRAP_HWBKPT.patch |
19 |
=================================================================== |
20 |
From 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 Mon Sep 17 00:00:00 2001 |
21 |
From: James Clarke <jrtc27@××××××.com> |
22 |
Date: Fri, 19 Jan 2018 17:22:49 +0000 |
23 |
Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including |
24 |
gdb_wait.h |
25 |
|
26 |
On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which |
27 |
contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot |
28 |
define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included |
29 |
earlier; include it from linux-ptrace.h so it can never come afterwards. |
30 |
|
31 |
gdb/ChangeLog: |
32 |
|
33 |
* nat/linux-ptrace.c: Remove unnecessary reinclusion of |
34 |
gdb_ptrace.h, and move including gdb_wait.h ... |
35 |
* nat/linux-ptrace.h: ... to here. |
36 |
--- |
37 |
gdb/nat/linux-ptrace.c | 2 -- |
38 |
gdb/nat/linux-ptrace.h | 1 + |
39 |
3 files changed, 7 insertions(+), 2 deletions(-) |
40 |
|
41 |
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c |
42 |
index 5c4ddc9590..1f21ef03a3 100644 |
43 |
--- a/gdb/nat/linux-ptrace.c |
44 |
+++ b/gdb/nat/linux-ptrace.c |
45 |
@@ -21,8 +21,6 @@ |
46 |
#include "linux-procfs.h" |
47 |
#include "linux-waitpid.h" |
48 |
#include "buffer.h" |
49 |
-#include "gdb_wait.h" |
50 |
-#include "gdb_ptrace.h" |
51 |
#ifdef HAVE_SYS_PROCFS_H |
52 |
#include <sys/procfs.h> |
53 |
#endif |
54 |
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h |
55 |
index 60967a3b6a..dc180fbf82 100644 |
56 |
--- a/gdb/nat/linux-ptrace.h |
57 |
+++ b/gdb/nat/linux-ptrace.h |
58 |
@@ -21,6 +21,7 @@ |
59 |
struct buffer; |
60 |
|
61 |
#include "nat/gdb_ptrace.h" |
62 |
+#include "gdb_wait.h" |
63 |
|
64 |
#ifdef __UCLIBC__ |
65 |
#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) |
66 |
-- |
67 |
2.16.1 |
68 |
|
69 |
|
70 |
|
71 |
|
72 |
1.1 src/patchsets/gdb/8.0.1/README.history |
73 |
|
74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gdb/8.0.1/README.history?rev=1.1&view=markup |
75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gdb/8.0.1/README.history?rev=1.1&content-type=text/plain |
76 |
|
77 |
Index: README.history |
78 |
=================================================================== |
79 |
1 30 Jan 2018 |
80 |
+ 01_all_ia64-TRAP_HWBKPT.patch |