diff options
Diffstat (limited to 'packages/gdb/7.12.1')
-rw-r--r-- | packages/gdb/7.12.1/0005-include-order.patch | 43 | ||||
-rw-r--r-- | packages/gdb/7.12.1/0006-duplicate-typedef.patch | 18 |
2 files changed, 61 insertions, 0 deletions
diff --git a/packages/gdb/7.12.1/0005-include-order.patch b/packages/gdb/7.12.1/0005-include-order.patch new file mode 100644 index 0000000..8cc1ea9 --- /dev/null +++ b/packages/gdb/7.12.1/0005-include-order.patch @@ -0,0 +1,43 @@ +commit 5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8 +Author: James Clarke <jrtc27@jrtc27.com> +Date: Fri Jan 19 17:22:49 2018 +0000 + + 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 + + 2 files changed, 1 insertion(+), 2 deletions(-) + +--- 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. +--- 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__)) diff --git a/packages/gdb/7.12.1/0006-duplicate-typedef.patch b/packages/gdb/7.12.1/0006-duplicate-typedef.patch new file mode 100644 index 0000000..cbbc3e2 --- /dev/null +++ b/packages/gdb/7.12.1/0006-duplicate-typedef.patch @@ -0,0 +1,18 @@ +diff -urpN gdb-7.12.1.orig/gdb/event-loop.h gdb-7.12.1/gdb/event-loop.h +--- gdb-7.12.1.orig/gdb/event-loop.h 2017-01-21 05:46:46.000000000 -0800 ++++ gdb-7.12.1/gdb/event-loop.h 2019-03-14 11:55:56.280325742 -0700 +@@ -66,6 +66,8 @@ + infinite loop. + + Corollary tasks are the creation and deletion of event sources. */ ++#ifndef _EVENT_LOOP_H_ ++#define _EVENT_LOOP_H_ + + typedef void *gdb_client_data; + struct async_signal_handler; +@@ -127,3 +129,5 @@ extern void mark_async_event_handler (st + extern void clear_async_event_handler (struct async_event_handler *handler); + + extern void initialize_async_signal_handlers (void); ++ ++#endif |