espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-05-21 01:07:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

hurd: add gnu_target pointer to fix thread API calls

Browse Source 
Fixes

../../gdb/gnu-nat.c:1110:28: error: cannot convert ‘ptid_t’ to ‘process_stratum_target*’
 1110 |        thread_change_ptid (inferior_ptid, ptid);

and others related to 5b6d1e4fa ("Multi-target support")

gdb/ChangeLog:

	* gnu-nat.h (gnu_target): New variable declaration.
	* i386-gnu-nat.c (_initialize_i386gnu_nat): Initialize
	gnu_target.
	* gnu-nat.c (gnu_target): New variable.
	(inf_validate_procs): Pass gnu_target to thread_change_ptid,
	add_thread_silent, and add_thread calls.
	(gnu_nat_target::create_inferior): Pass gnu_target to
	add_thread_silent, thread_change_ptid call.
	(gnu_nat_target::detach): Pass gnu_target to detach_inferior
	call.
This commit is contained in:
Samuel Thibault
2020-05-30 18:43:25 +00:00
parent 5a8b86270b
commit 53dff92cb5
4 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdb/ChangeLog
View File

@ -1,3 +1,16 @@
2020-05-30 Samuel Thibault <samuel.thibault@ens-lyon.org>
* gnu-nat.h (gnu_target): New variable declaration.
* i386-gnu-nat.c (_initialize_i386gnu_nat): Initialize
gnu_target.
* gnu-nat.c (gnu_target): New variable.
(inf_validate_procs): Pass gnu_target to thread_change_ptid,
add_thread_silent, and add_thread calls.
(gnu_nat_target::create_inferior): Pass gnu_target to
add_thread_silent, thread_change_ptid call.
(gnu_nat_target::detach): Pass gnu_target to detach_inferior
call.
2020-05-30 Samuel Thibault <samuel.thibault@ens-lyon.org> 2020-05-30 Samuel Thibault <samuel.thibault@ens-lyon.org>
* gnu-nat.c (gnu_xfer_auxv): Remove unused `res' variable. * gnu-nat.c (gnu_xfer_auxv): Remove unused `res' variable.

14
gdb/gnu-nat.c
View File

@ -85,6 +85,8 @@ extern "C"
#include "msg_U.h" #include "msg_U.h"
} }
struct gnu_nat_target *gnu_target;
static process_t proc_server = MACH_PORT_NULL; static process_t proc_server = MACH_PORT_NULL;
/* If we've sent a proc_wait_request to the proc server, the pid of the /* If we've sent a proc_wait_request to the proc server, the pid of the
@ -1107,12 +1109,12 @@ inf_validate_procs (struct inf *inf)
if (inferior_ptid == ptid_t (inf->pid)) if (inferior_ptid == ptid_t (inf->pid))
/* This is the first time we're hearing about thread /* This is the first time we're hearing about thread
ids, after a fork-child. */ ids, after a fork-child. */
thread_change_ptid (inferior_ptid, ptid); thread_change_ptid (gnu_target, inferior_ptid, ptid);
else if (inf->pending_execs != 0) else if (inf->pending_execs != 0)
/* This is a shell thread. */ /* This is a shell thread. */
add_thread_silent (ptid); add_thread_silent (gnu_target, ptid);
else else
add_thread (ptid); add_thread (gnu_target, ptid);
} }
} }
@ -2150,7 +2152,7 @@ gnu_nat_target::create_inferior (const char *exec_file,
/* We have something that executes now. We'll be running through /* We have something that executes now. We'll be running through
the shell at this point (if startup-with-shell is true), but the the shell at this point (if startup-with-shell is true), but the
pid shouldn't change. */ pid shouldn't change. */
add_thread_silent (ptid_t (pid)); add_thread_silent (gnu_target, ptid_t (pid));
/* Attach to the now stopped child, which is actually a shell... */ /* Attach to the now stopped child, which is actually a shell... */
inf_debug (inf, "attaching to child: %d", pid); inf_debug (inf, "attaching to child: %d", pid);
@ -2168,7 +2170,7 @@ gnu_nat_target::create_inferior (const char *exec_file,
inf_resume (inf); inf_resume (inf);
/* We now have thread info. */ /* We now have thread info. */
thread_change_ptid (inferior_ptid, thread_change_ptid (gnu_target, inferior_ptid,
ptid_t (inf->pid, inf_pick_first_thread (), 0)); ptid_t (inf->pid, inf_pick_first_thread (), 0));
gdb_startup_inferior (pid, START_INFERIOR_TRAPS_EXPECTED); gdb_startup_inferior (pid, START_INFERIOR_TRAPS_EXPECTED);
@ -2274,7 +2276,7 @@ gnu_nat_target::detach (inferior *inf, int from_tty)
inf_detach (gnu_current_inf); inf_detach (gnu_current_inf);
inferior_ptid = null_ptid; inferior_ptid = null_ptid;
detach_inferior (find_inferior_pid (pid)); detach_inferior (find_inferior_pid (gnu_target, pid));
maybe_unpush_target (); maybe_unpush_target ();
} }

3
gdb/gnu-nat.h
View File

@ -150,4 +150,7 @@ struct gnu_nat_target : public inf_child_target
void stop (ptid_t) override; void stop (ptid_t) override;
}; };
/* The final/concrete instance. */
extern gnu_nat_target *gnu_target;
#endif /* GNU_NAT_H */ #endif /* GNU_NAT_H */

2
gdb/i386-gnu-nat.c
View File

@ -439,6 +439,8 @@ _initialize_i386gnu_nat ()
x86_set_debug_register_length (4); x86_set_debug_register_length (4);
#endif /* i386_DEBUG_STATE */ #endif /* i386_DEBUG_STATE */
gnu_target = &the_i386_gnu_nat_target;
/* Register the target. */ /* Register the target. */
add_inf_child_target (&the_i386_gnu_nat_target); add_inf_child_target (&the_i386_gnu_nat_target);
} }