[PATCH 2/2] gdb: Add missing #ifdef USE_THREAD_DB to gdbserver

[PATCH 2/2] gdb: Add missing #ifdef USE_THREAD_DB to gdbserver

[James Clarke]

gdb/ChangeLog:
	* gdbserver/linux-low.c (handle_extended_wait): Surround call to
	thread_db_notice_clone with #ifdef USE_THREAD_DB.
---
 gdb/gdbserver/linux-low.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index f6a52d5..398cd70 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -661,7 +661,9 @@ handle_extended_wait (struct lwp_info **orig_event_lwp, int wstat)
 	  new_lwp->status_pending = status;
 	}
 
+#ifdef USE_THREAD_DB
       thread_db_notice_clone (event_thr, ptid);
+#endif
 
       /* Don't report the event.  */
       return 1;
-- 
1.7.10.4

[PATCH 1/2] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h

[James Clarke]

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(-)

diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 438177f..1240eea 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 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__))
-- 
1.7.10.4

Re: [PATCH 1/2] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h

[Alan Modra]

On Thu, Dec 14, 2017 at 11:32:41PM +0000, James Clarke wrote:
> gdb/ChangeLog:

Patches for gdb should go to gdb-patches@sourceware.org

-- 
Alan Modra
Australia Development Lab, IBM

Re: [PATCH 1/2] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h

[James Clarke]

On 15 Dec 2017, at 09:44, Alan Modra <amodra@gmail.com> wrote:
> 
> On Thu, Dec 14, 2017 at 11:32:41PM +0000, James Clarke wrote:
>> gdb/ChangeLog:
> 
> Patches for gdb should go to gdb-patches@sourceware.org

Yeah, I already sent them there when I realised there was a separate mailing
list; sorry for the noise.

James