From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.netbsd.org (mail.NetBSD.org [IPv6:2001:470:a085:999::25]) by sourceware.org (Postfix) with ESMTPS id ED0303857C7A for ; Fri, 18 Sep 2020 18:21:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org ED0303857C7A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=netbsd.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kamil@netbsd.org Received: from [IPv6:::1] (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7132184D62; Fri, 18 Sep 2020 18:21:47 +0000 (UTC) Subject: Re: [PATCH] Make target_wait options use enum flags To: Tom Tromey Cc: Simon Marchi , gdb-patches@sourceware.org References: <20200727173526.2186755-1-tromey@adacore.com> <87d02lafjn.fsf@tromey.com> <878sd9aevx.fsf@tromey.com> <87k0wt8uyz.fsf@tromey.com> From: Kamil Rytarowski Autocrypt: addr=kamil@netbsd.org; keydata= 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 Message-ID: <8281ecfa-1c39-29e3-ce06-37a5ff207a6a@netbsd.org> Date: Fri, 18 Sep 2020 20:18:26 +0200 User-Agent: Mozilla/5.0 (X11; NetBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <87k0wt8uyz.fsf@tromey.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LacZUObY9sSHTgdJqJY23vfefzTlhk1Y1" X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2020 18:22:01 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LacZUObY9sSHTgdJqJY23vfefzTlhk1Y1 Content-Type: multipart/mixed; boundary="XKDwolsZyAB8UidvV4ZfWODfh1v05RPuN"; protected-headers="v1" From: Kamil Rytarowski To: Tom Tromey Cc: Simon Marchi , gdb-patches@sourceware.org Message-ID: <8281ecfa-1c39-29e3-ce06-37a5ff207a6a@netbsd.org> Subject: Re: [PATCH] Make target_wait options use enum flags References: <20200727173526.2186755-1-tromey@adacore.com> <87d02lafjn.fsf@tromey.com> <878sd9aevx.fsf@tromey.com> <87k0wt8uyz.fsf@tromey.com> In-Reply-To: <87k0wt8uyz.fsf@tromey.com> --XKDwolsZyAB8UidvV4ZfWODfh1v05RPuN Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 16.09.2020 19:58, Tom Tromey wrote: > Tom> Actually, I'm not yet -- the enum flags update pointed out a coupl= e more > Tom> spots to fix, and then while grepping to see if any other targets = needed > Tom> the same treatment, I found some other problems. So, this patch d= id end > Tom> up catching bugs after all :) >=20 > Here's the updated patch. >=20 > Kamil, could you check the NetBSD changes? >=20 I've checked this patch (on top of "6e25f88828f (upstream/master) bpf: xBPF SDIV, SMOD instructions") and the NetBSD gdbserver still works. > thanks, > Tom >=20 > commit b9bbce754075de503869d44fcd7ee636888dfb7a > Author: Tom Tromey > Date: Wed Sep 16 09:51:59 2020 -0600 >=20 > Make target_wait options use enum flags > =20 > This changes TARGET_WNOHANG to be a member of an enum, rather than = a > define, and also adds a DEF_ENUM_FLAGS_TYPE for this type. Then, i= t > changes target_wait and the various target wait methods to use this= > type rather than "int". > =20 > This didn't catch any bugs, but it seems like a decent cleanup > nevertheless. > =20 > I did not change deprecated_target_wait_hook, since that's only use= d > out-of-tree (by Insight), and there didn't seem to be a need. > =20 > I can't build some of these targets, so I modified them on a > best-effort basis. I don't think this patch should go in before th= e > release branch is made. > =20 > gdb/ChangeLog > 2020-09-16 Tom Tromey > =20 > * windows-nat.c (struct windows_nat_target) : Update.= > (windows_nat_target::wait): Update. > * target/wait.h (enum target_wait_flag): New. Use > DEF_ENUM_FLAGS_TYPE. > * target/target.h (target_wait): Change type of options. > * target.h (target_options_to_string, default_target_wait):= > Update. > (struct target_ops) : Change type of options. > * target.c (target_wait, default_target_wait, do_option): C= hange > type of "options". > (target_options_to_string): Likewise. > * target-delegates.c: Rebuild. > * target-debug.h (target_debug_print_target_wait_flags): Re= name > from target_debug_print_options. > * sol-thread.c (class sol_thread_target) : Update. > (sol_thread_target::wait): Update. > * rs6000-nat.c (class rs6000_nat_target) : Update. > (rs6000_nat_target::wait): Update. > * remote.c (class remote_target) : > Update. > (remote_target::wait_ns, remote_target::wait_as): Change ty= pe of > "options". > (remote_target::wait): Update. > * remote-sim.c (struct gdbsim_target) : Update. > (gdbsim_target::wait): Update. > * record-full.c (class record_full_base_target) : Upd= ate. > (record_full_wait_1): Change type of "options". > (record_full_base_target::wait): Update. > * record-btrace.c (class record_btrace_target) : Upda= te. > (record_btrace_target::wait): Update. > * ravenscar-thread.c (struct ravenscar_thread_target) : > Update. > (ravenscar_thread_target::wait): Update. > * procfs.c (class procfs_target) : Update. > (procfs_target::wait): Update. > * obsd-nat.h (class obsd_nat_target) : Update. > * obsd-nat.c (obsd_nat_target::wait): Update. > * nto-procfs.c (struct nto_procfs_target) : Update. > (nto_procfs_target::wait): Update. > * nbsd-nat.h (struct nbsd_nat_target) : Update. > * nbsd-nat.c (nbsd_wait): Change type of "options". > (nbsd_nat_target::wait): Update. > * linux-thread-db.c (class thread_db_target) : Update= =2E > (thread_db_target::wait): Update. > * linux-nat.h (class linux_nat_target) : Update. > * linux-nat.c (linux_nat_target::wait): Update. > (linux_nat_wait_1): Update. > * infrun.c (do_target_wait_1, do_target_wait): Change type = of > "options". > * inf-ptrace.h (struct inf_ptrace_target) : Update. > * inf-ptrace.c (inf_ptrace_target::wait): Update. > * go32-nat.c (struct go32_nat_target) : Update. > (go32_nat_target::wait): Update. > * gnu-nat.h (struct gnu_nat_target) : Update. > * gnu-nat.c (gnu_nat_target::wait): Update. > * fbsd-nat.h (class fbsd_nat_target) : Update. > * fbsd-nat.c (fbsd_nat_target::wait): Update. > * darwin-nat.h (class darwin_nat_target) : Update. > * darwin-nat.c (darwin_nat_target::wait): Update. > * bsd-uthread.c (struct bsd_uthread_target) : Update.= > (bsd_uthread_target::wait): Update. > * aix-thread.c (class aix_thread_target) : Update. > (aix_thread_target::wait): Update. > =20 > gdbserver/ChangeLog > 2020-09-16 Tom Tromey > =20 > * netbsd-low.h (class netbsd_process_target) : Update= =2E > * netbsd-low.cc (netbsd_waitpid, netbsd_wait) > (netbsd_process_target::wait): Change type of target_option= s. > * win32-low.h (class win32_process_target) : Update. > * win32-low.cc (win32_process_target::wait): Update. > * target.h (class process_stratum_target) : Update. > (mywait): Update. > * target.cc (mywait, target_wait): Change type of "options"= =2E > * linux-low.h (class linux_process_target) : > Update. > * linux-low.cc (linux_process_target::wait) > (linux_process_target::wait_1): Update. >=20 > diff --git a/gdb/ChangeLog b/gdb/ChangeLog > index 85c733e203f..091b5da65d2 100644 > --- a/gdb/ChangeLog > +++ b/gdb/ChangeLog > @@ -1,3 +1,69 @@ > +2020-09-16 Tom Tromey > + > + * windows-nat.c (struct windows_nat_target) : Update. > + (windows_nat_target::wait): Update. > + * target/wait.h (enum target_wait_flag): New. Use > + DEF_ENUM_FLAGS_TYPE. > + * target/target.h (target_wait): Change type of options. > + * target.h (target_options_to_string, default_target_wait): > + Update. > + (struct target_ops) : Change type of options. > + * target.c (target_wait, default_target_wait, do_option): Change > + type of "options". > + (target_options_to_string): Likewise. > + * target-delegates.c: Rebuild. > + * target-debug.h (target_debug_print_target_wait_flags): Rename > + from target_debug_print_options. > + * sol-thread.c (class sol_thread_target) : Update. > + (sol_thread_target::wait): Update. > + * rs6000-nat.c (class rs6000_nat_target) : Update. > + (rs6000_nat_target::wait): Update. > + * remote.c (class remote_target) : > + Update. > + (remote_target::wait_ns, remote_target::wait_as): Change type of > + "options". > + (remote_target::wait): Update. > + * remote-sim.c (struct gdbsim_target) : Update. > + (gdbsim_target::wait): Update. > + * record-full.c (class record_full_base_target) : Update. > + (record_full_wait_1): Change type of "options". > + (record_full_base_target::wait): Update. > + * record-btrace.c (class record_btrace_target) : Update. > + (record_btrace_target::wait): Update. > + * ravenscar-thread.c (struct ravenscar_thread_target) : > + Update. > + (ravenscar_thread_target::wait): Update. > + * procfs.c (class procfs_target) : Update. > + (procfs_target::wait): Update. > + * obsd-nat.h (class obsd_nat_target) : Update. > + * obsd-nat.c (obsd_nat_target::wait): Update. > + * nto-procfs.c (struct nto_procfs_target) : Update. > + (nto_procfs_target::wait): Update. > + * nbsd-nat.h (struct nbsd_nat_target) : Update. > + * nbsd-nat.c (nbsd_wait): Change type of "options". > + (nbsd_nat_target::wait): Update. > + * linux-thread-db.c (class thread_db_target) : Update. > + (thread_db_target::wait): Update. > + * linux-nat.h (class linux_nat_target) : Update. > + * linux-nat.c (linux_nat_target::wait): Update. > + (linux_nat_wait_1): Update. > + * infrun.c (do_target_wait_1, do_target_wait): Change type of > + "options". > + * inf-ptrace.h (struct inf_ptrace_target) : Update. > + * inf-ptrace.c (inf_ptrace_target::wait): Update. > + * go32-nat.c (struct go32_nat_target) : Update. > + (go32_nat_target::wait): Update. > + * gnu-nat.h (struct gnu_nat_target) : Update. > + * gnu-nat.c (gnu_nat_target::wait): Update. > + * fbsd-nat.h (class fbsd_nat_target) : Update. > + * fbsd-nat.c (fbsd_nat_target::wait): Update. > + * darwin-nat.h (class darwin_nat_target) : Update. > + * darwin-nat.c (darwin_nat_target::wait): Update. > + * bsd-uthread.c (struct bsd_uthread_target) : Update. > + (bsd_uthread_target::wait): Update. > + * aix-thread.c (class aix_thread_target) : Update. > + (aix_thread_target::wait): Update. > + > 2020-09-16 Tankut Baris Aktemur > =20 > * breakpoint.c (commands_command_1): Make a copy of the 'arg' > diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c > index 3963a08c840..ed30df5f3f6 100644 > --- a/gdb/aix-thread.c > +++ b/gdb/aix-thread.c > @@ -124,7 +124,7 @@ class aix_thread_target final : public target_ops > =20 > void detach (inferior *, int) override; > void resume (ptid_t, int, enum gdb_signal) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > @@ -1077,7 +1077,7 @@ aix_thread_target::resume (ptid_t ptid, int step,= enum gdb_signal sig) > =20 > ptid_t > aix_thread_target::wait (ptid_t ptid, struct target_waitstatus *status= , > - int options) > + target_wait_flags options) > { > { > scoped_restore save_inferior_ptid =3D make_scoped_restore (&inferi= or_ptid); > diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c > index 11ce0f439bf..144e8b920fa 100644 > --- a/gdb/bsd-uthread.c > +++ b/gdb/bsd-uthread.c > @@ -53,7 +53,7 @@ struct bsd_uthread_target final : public target_ops > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > void resume (ptid_t, int, enum gdb_signal) override; > =20 > bool thread_alive (ptid_t ptid) override; > @@ -377,7 +377,7 @@ bsd_uthread_target::store_registers (struct regcach= e *regcache, int regnum) > =20 > ptid_t > bsd_uthread_target::wait (ptid_t ptid, struct target_waitstatus *statu= s, > - int options) > + target_wait_flags options) > { > enum bfd_endian byte_order =3D gdbarch_byte_order (target_gdbarch ()= ); > CORE_ADDR addr; > diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c > index 0d7b028e39c..76d0fe87a85 100644 > --- a/gdb/darwin-nat.c > +++ b/gdb/darwin-nat.c > @@ -1285,7 +1285,7 @@ darwin_nat_target::wait_1 (ptid_t ptid, struct ta= rget_waitstatus *status) > =20 > ptid_t > darwin_nat_target::wait (ptid_t ptid, struct target_waitstatus *status= , > - int options) > + target_wait_flags options) > { > return wait_1 (ptid, status); > } > diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h > index 86bb3389212..8a84cdc83dd 100644 > --- a/gdb/darwin-nat.h > +++ b/gdb/darwin-nat.h > @@ -86,7 +86,7 @@ class darwin_nat_target : public inf_child_target > =20 > void detach (inferior *, int) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void mourn_inferior () override; > =20 > diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c > index a355ebe4382..29c30623d09 100644 > --- a/gdb/fbsd-nat.c > +++ b/gdb/fbsd-nat.c > @@ -1295,7 +1295,7 @@ fbsd_handle_debug_trap (fbsd_nat_target *target, = ptid_t ptid, > =20 > ptid_t > fbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatu= s, > - int target_options) > + target_wait_flags target_options) > { > ptid_t wptid; > =20 > diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h > index 1b1e043dae7..58bea352c88 100644 > --- a/gdb/fbsd-nat.h > +++ b/gdb/fbsd-nat.h > @@ -70,7 +70,7 @@ class fbsd_nat_target : public inf_ptrace_target > =20 > void resume (ptid_t, int, enum gdb_signal) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void post_startup_inferior (ptid_t) override; > void post_attach (int) override; > diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c > index 3cee06dc4db..32af0bf3192 100644 > --- a/gdb/gnu-nat.c > +++ b/gdb/gnu-nat.c > @@ -1436,7 +1436,7 @@ static struct inf *waiting_inf; > =20 > ptid_t > gnu_nat_target::wait (ptid_t ptid, struct target_waitstatus *status, > - int options) > + target_wait_flags options) > { > struct msg > { > diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h > index 0e7ff8d5aa9..28c08108265 100644 > --- a/gdb/gnu-nat.h > +++ b/gdb/gnu-nat.h > @@ -124,7 +124,7 @@ struct gnu_nat_target : public inf_child_target > void detach (inferior *, int) override; > void resume (ptid_t, int, enum gdb_signal) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > enum target_xfer_status xfer_partial (enum target_object object, > const char *annex, > gdb_byte *readbuf, > diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c > index 8ffd28985ab..4ea2dd8714f 100644 > --- a/gdb/go32-nat.c > +++ b/gdb/go32-nat.c > @@ -342,7 +342,7 @@ struct go32_nat_target final : public x86_nat_targe= t > =20 > void resume (ptid_t, int, enum gdb_signal) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > @@ -419,7 +419,7 @@ static char child_cwd[FILENAME_MAX]; > =20 > ptid_t > go32_nat_target::wait (ptid_t ptid, struct target_waitstatus *status, > - int options) > + target_wait_flags options) > { > int i; > unsigned char saved_opcode; > diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c > index ae0b0f7ff0d..d5a062163c7 100644 > --- a/gdb/inf-ptrace.c > +++ b/gdb/inf-ptrace.c > @@ -316,7 +316,7 @@ inf_ptrace_target::resume (ptid_t ptid, int step, e= num gdb_signal signal) > =20 > ptid_t > inf_ptrace_target::wait (ptid_t ptid, struct target_waitstatus *oursta= tus, > - int options) > + target_wait_flags options) > { > pid_t pid; > int status, save_errno; > diff --git a/gdb/inf-ptrace.h b/gdb/inf-ptrace.h > index e2079faee3d..d3c59e6d46a 100644 > --- a/gdb/inf-ptrace.h > +++ b/gdb/inf-ptrace.h > @@ -35,7 +35,7 @@ struct inf_ptrace_target : public inf_child_target > =20 > void resume (ptid_t, int, enum gdb_signal) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void files_info () override; > =20 > diff --git a/gdb/infrun.c b/gdb/infrun.c > index 5773fd03951..3e49cb4c641 100644 > --- a/gdb/infrun.c > +++ b/gdb/infrun.c > @@ -3423,7 +3423,7 @@ random_pending_event_thread (inferior *inf, ptid_= t waiton_ptid) > =20 > static ptid_t > do_target_wait_1 (inferior *inf, ptid_t ptid, > - target_waitstatus *status, int options) > + target_waitstatus *status, target_wait_flags options) > { > ptid_t event_ptid; > struct thread_info *tp; > @@ -3546,7 +3546,8 @@ do_target_wait_1 (inferior *inf, ptid_t ptid, > more events. Polls for events from all inferiors/targets. */ > =20 > static bool > -do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, int op= tions) > +do_target_wait (ptid_t wait_ptid, execution_control_state *ecs, > + target_wait_flags options) > { > int num_inferiors =3D 0; > int random_selector; > diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c > index 4f53670da5e..44b59485d7b 100644 > --- a/gdb/linux-nat.c > +++ b/gdb/linux-nat.c > @@ -3131,7 +3131,7 @@ filter_exit_event (struct lwp_info *event_child, > =20 > static ptid_t > linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus, > - int target_options) > + target_wait_flags target_options) > { > sigset_t prev_mask; > enum resume_kind last_resume_kind; > @@ -3411,7 +3411,7 @@ resume_stopped_resumed_lwps (struct lwp_info *lp,= const ptid_t wait_ptid) > =20 > ptid_t > linux_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstat= us, > - int target_options) > + target_wait_flags target_options) > { > ptid_t event_ptid; > =20 > diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h > index 1af9e830c83..caaeff85207 100644 > --- a/gdb/linux-nat.h > +++ b/gdb/linux-nat.h > @@ -46,7 +46,7 @@ class linux_nat_target : public inf_ptrace_target > =20 > void resume (ptid_t, int, enum gdb_signal) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void pass_signals (gdb::array_view) override; > =20 > diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c > index b3cda05cd6e..fbddfed3c59 100644 > --- a/gdb/linux-thread-db.c > +++ b/gdb/linux-thread-db.c > @@ -92,7 +92,7 @@ class thread_db_target final : public target_ops > strata stratum () const override { return thread_stratum; } > =20 > void detach (inferior *, int) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > void resume (ptid_t, int, enum gdb_signal) override; > void mourn_inferior () override; > void update_thread_list () override; > @@ -1379,7 +1379,7 @@ thread_db_target::detach (inferior *inf, int from= _tty) > =20 > ptid_t > thread_db_target::wait (ptid_t ptid, struct target_waitstatus *ourstat= us, > - int options) > + target_wait_flags options) > { > struct thread_db_info *info; > =20 > diff --git a/gdb/nbsd-nat.c b/gdb/nbsd-nat.c > index b12d86e8256..7a07fbf6d8a 100644 > --- a/gdb/nbsd-nat.c > +++ b/gdb/nbsd-nat.c > @@ -540,7 +540,8 @@ nbsd_nat_target::resume (ptid_t ptid, int step, enu= m gdb_signal signal) > /* Implement a safe wrapper around waitpid(). */ > =20 > static pid_t > -nbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int optio= ns) > +nbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus, > + target_wait_flags options) > { > pid_t pid; > int status; > @@ -569,7 +570,7 @@ nbsd_wait (ptid_t ptid, struct target_waitstatus *o= urstatus, int options) > =20 > ptid_t > nbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatu= s, > - int target_options) > + target_wait_flags target_options) > { > pid_t pid =3D nbsd_wait (ptid, ourstatus, target_options); > ptid_t wptid =3D ptid_t (pid); > diff --git a/gdb/nbsd-nat.h b/gdb/nbsd-nat.h > index b09d5b1e3bb..7461667cefb 100644 > --- a/gdb/nbsd-nat.h > +++ b/gdb/nbsd-nat.h > @@ -41,7 +41,7 @@ struct nbsd_nat_target : public inf_ptrace_target > bool info_proc (const char *, enum info_proc_what) override; > =20 > void resume (ptid_t, int, enum gdb_signal) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > int insert_exec_catchpoint (int pid) override; > int remove_exec_catchpoint (int pid) override; > int set_syscall_catchpoint (int pid, bool needed, int any_count, > diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c > index 91d2cc5914d..ef1615df3e2 100644 > --- a/gdb/nto-procfs.c > +++ b/gdb/nto-procfs.c > @@ -69,7 +69,7 @@ struct nto_procfs_target : public inf_child_target > =20 > void resume (ptid_t, int, enum gdb_signal) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > @@ -795,7 +795,7 @@ nto_handle_sigint (int signo) > =20 > sptid_t > nto_procfs_target::wait (ptid_t ptid, struct target_waitstatus *oursta= tus, > - int options) > + target_wait_flags options) > { > sigset_t set; > siginfo_t info; > diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c > index 6667a0add7f..310e2b72fcd 100644 > --- a/gdb/obsd-nat.c > +++ b/gdb/obsd-nat.c > @@ -74,7 +74,7 @@ obsd_nat_target::update_thread_list () > =20 > ptid_t > obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatu= s, > - int options) > + target_wait_flags options) > { > pid_t pid; > int status, save_errno; > diff --git a/gdb/obsd-nat.h b/gdb/obsd-nat.h > index e5962004d4c..3d3e50c57ec 100644 > --- a/gdb/obsd-nat.h > +++ b/gdb/obsd-nat.h > @@ -27,7 +27,7 @@ class obsd_nat_target : public inf_ptrace_target > /* Override some methods to support threads. */ > std::string pid_to_str (ptid_t) override; > void update_thread_list () override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > #ifdef PT_GET_PROCESS_STATE > bool follow_fork (bool, bool) override; > diff --git a/gdb/procfs.c b/gdb/procfs.c > index b628c2d0355..a06f0357ec3 100644 > --- a/gdb/procfs.c > +++ b/gdb/procfs.c > @@ -105,7 +105,7 @@ class procfs_target final : public inf_child_target= > void detach (inferior *inf, int) override; > =20 > void resume (ptid_t, int, enum gdb_signal) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > @@ -2033,7 +2033,7 @@ procfs_target::store_registers (struct regcache *= regcache, int regnum) > =20 > ptid_t > procfs_target::wait (ptid_t ptid, struct target_waitstatus *status, > - int options) > + target_wait_flags options) > { > /* First cut: loosely based on original version 2.1. */ > procinfo *pi; > diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c > index 387ebcb32e9..cc94ff8e1ea 100644 > --- a/gdb/ravenscar-thread.c > +++ b/gdb/ravenscar-thread.c > @@ -87,7 +87,7 @@ struct ravenscar_thread_target final : public target_= ops > =20 > strata stratum () const override { return thread_stratum; } > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > void resume (ptid_t, int, enum gdb_signal) override; > =20 > void fetch_registers (struct regcache *, int) override; > @@ -385,7 +385,7 @@ ravenscar_thread_target::resume (ptid_t ptid, int s= tep, > ptid_t > ravenscar_thread_target::wait (ptid_t ptid, > struct target_waitstatus *status, > - int options) > + target_wait_flags options) > { > process_stratum_target *beneath > =3D as_process_stratum_target (this->beneath ()); > diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c > index fd0d13fb258..c1430e9b533 100644 > --- a/gdb/record-btrace.c > +++ b/gdb/record-btrace.c > @@ -118,7 +118,7 @@ class record_btrace_target final : public target_op= s > =20 > void commit_resume () override; > void resume (ptid_t, int, enum gdb_signal) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void stop (ptid_t) override; > void update_thread_list () override; > @@ -2537,12 +2537,13 @@ record_btrace_maybe_mark_async_event > =20 > ptid_t > record_btrace_target::wait (ptid_t ptid, struct target_waitstatus *sta= tus, > - int options) > + target_wait_flags options) > { > std::vector moving; > std::vector no_history; > =20 > - DEBUG ("wait %s (0x%x)", target_pid_to_str (ptid).c_str (), options)= ; > + DEBUG ("wait %s (0x%x)", target_pid_to_str (ptid).c_str (), > + (unsigned) options); > =20 > /* As long as we're not replaying, just forward the request. */ > if ((::execution_direction !=3D EXEC_REVERSE) > diff --git a/gdb/record-full.c b/gdb/record-full.c > index 1d8f1930a5b..1c8b791ffb9 100644 > --- a/gdb/record-full.c > +++ b/gdb/record-full.c > @@ -225,7 +225,7 @@ class record_full_base_target : public target_ops > =20 > void close () override; > void async (int) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > bool stopped_by_watchpoint () override; > bool stopped_data_address (CORE_ADDR *) override; > =20 > @@ -1155,7 +1155,7 @@ record_full_sig_handler (int signo) > static ptid_t > record_full_wait_1 (struct target_ops *ops, > ptid_t ptid, struct target_waitstatus *status, > - int options) > + target_wait_flags options) > { > scoped_restore restore_operation_disable > =3D record_full_gdb_operation_disable_set (); > @@ -1468,7 +1468,7 @@ record_full_wait_1 (struct target_ops *ops, > =20 > ptid_t > record_full_base_target::wait (ptid_t ptid, struct target_waitstatus *= status, > - int options) > + target_wait_flags options) > { > ptid_t return_ptid; > =20 > diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c > index 9af6486bca8..9e1c2b151c8 100644 > --- a/gdb/remote-sim.c > +++ b/gdb/remote-sim.c > @@ -131,7 +131,7 @@ struct gdbsim_target final > void detach (inferior *inf, int) override; > =20 > void resume (ptid_t, int, enum gdb_signal) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > @@ -927,7 +927,8 @@ gdbsim_cntrl_c (int signo) > } > =20 > ptid_t > -gdbsim_target::wait (ptid_t ptid, struct target_waitstatus *status, in= t options) > +gdbsim_target::wait (ptid_t ptid, struct target_waitstatus *status, > + target_wait_flags options) > { > struct sim_inferior_data *sim_data; > static sighandler_t prev_sigint; > diff --git a/gdb/remote.c b/gdb/remote.c > index 59075cb09f2..5fc80ebc8f7 100644 > --- a/gdb/remote.c > +++ b/gdb/remote.c > @@ -422,7 +422,7 @@ class remote_target : public process_stratum_target= > =20 > void commit_resume () override; > void resume (ptid_t, int, enum gdb_signal) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > @@ -739,9 +739,9 @@ class remote_target : public process_stratum_target= > void add_current_inferior_and_thread (char *wait_status); > =20 > ptid_t wait_ns (ptid_t ptid, struct target_waitstatus *status, > - int options); > + target_wait_flags options); > ptid_t wait_as (ptid_t ptid, target_waitstatus *status, > - int options); > + target_wait_flags options); > =20 > ptid_t process_stop_reply (struct stop_reply *stop_reply, > target_waitstatus *status); > @@ -7771,7 +7771,8 @@ remote_target::process_stop_reply (struct stop_re= ply *stop_reply, > /* The non-stop mode version of target_wait. */ > =20 > ptid_t > -remote_target::wait_ns (ptid_t ptid, struct target_waitstatus *status,= int options) > +remote_target::wait_ns (ptid_t ptid, struct target_waitstatus *status,= > + target_wait_flags options) > { > struct remote_state *rs =3D get_remote_state (); > struct stop_reply *stop_reply; > @@ -7839,7 +7840,8 @@ first_remote_resumed_thread (remote_target *targe= t) > STATUS just as `wait' would. */ > =20 > ptid_t > -remote_target::wait_as (ptid_t ptid, target_waitstatus *status, int op= tions) > +remote_target::wait_as (ptid_t ptid, target_waitstatus *status, > + target_wait_flags options) > { > struct remote_state *rs =3D get_remote_state (); > ptid_t event_ptid =3D null_ptid; > @@ -7992,7 +7994,8 @@ remote_target::wait_as (ptid_t ptid, target_waits= tatus *status, int options) > STATUS just as `wait' would. */ > =20 > ptid_t > -remote_target::wait (ptid_t ptid, struct target_waitstatus *status, in= t options) > +remote_target::wait (ptid_t ptid, struct target_waitstatus *status, > + target_wait_flags options) > { > ptid_t event_ptid; > =20 > diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c > index 654e06e3e4b..29154cfc2e7 100644 > --- a/gdb/rs6000-nat.c > +++ b/gdb/rs6000-nat.c > @@ -90,7 +90,7 @@ class rs6000_nat_target final : public inf_ptrace_tar= get > void create_inferior (const char *, const std::string &, > char **, int) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > private: > enum target_xfer_status > @@ -495,7 +495,7 @@ rs6000_nat_target::xfer_partial (enum target_object= object, > =20 > ptid_t > rs6000_nat_target::wait (ptid_t ptid, struct target_waitstatus *oursta= tus, > - int options) > + target_wait_flags options) > { > pid_t pid; > int status, save_errno; > diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c > index a24d51d1db2..bb33a20ea52 100644 > --- a/gdb/sol-thread.c > +++ b/gdb/sol-thread.c > @@ -84,7 +84,7 @@ class sol_thread_target final : public target_ops > strata stratum () const override { return thread_stratum; } > =20 > void detach (inferior *, int) override; > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > void resume (ptid_t, int, enum gdb_signal) override; > void mourn_inferior () override; > std::string pid_to_str (ptid_t) override; > @@ -425,7 +425,7 @@ sol_thread_target::resume (ptid_t ptid, int step, e= num gdb_signal signo) > =20 > ptid_t > sol_thread_target::wait (ptid_t ptid, struct target_waitstatus *oursta= tus, > - int options) > + target_wait_flags options) > { > if (ptid.pid () !=3D -1) > { > diff --git a/gdb/target-debug.h b/gdb/target-debug.h > index 46d17a359d9..1b2feb2c7fb 100644 > --- a/gdb/target-debug.h > +++ b/gdb/target-debug.h > @@ -205,7 +205,7 @@ target_debug_print_struct_target_waitstatus_p (stru= ct target_waitstatus *status) > target_debug_do_print ((X) ? "step" : "continue") > =20 > static void > -target_debug_print_options (int options) > +target_debug_print_target_wait_flags (target_wait_flags options) > { > std::string str =3D target_options_to_string (options); > =20 > diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c > index 15f441edf28..c0968e2040e 100644 > --- a/gdb/target-delegates.c > +++ b/gdb/target-delegates.c > @@ -15,7 +15,7 @@ struct dummy_target : public target_ops > void disconnect (const char *arg0, int arg1) override; > void resume (ptid_t arg0, int arg1, enum gdb_signal arg2) override; > void commit_resume () override; > - ptid_t wait (ptid_t arg0, struct target_waitstatus *arg1, int arg2) = override; > + ptid_t wait (ptid_t arg0, struct target_waitstatus *arg1, target_wai= t_flags arg2) override; > void fetch_registers (struct regcache *arg0, int arg1) override; > void store_registers (struct regcache *arg0, int arg1) override; > void prepare_to_store (struct regcache *arg0) override; > @@ -186,7 +186,7 @@ struct debug_target : public target_ops > void disconnect (const char *arg0, int arg1) override; > void resume (ptid_t arg0, int arg1, enum gdb_signal arg2) override; > void commit_resume () override; > - ptid_t wait (ptid_t arg0, struct target_waitstatus *arg1, int arg2) = override; > + ptid_t wait (ptid_t arg0, struct target_waitstatus *arg1, target_wai= t_flags arg2) override; > void fetch_registers (struct regcache *arg0, int arg1) override; > void store_registers (struct regcache *arg0, int arg1) override; > void prepare_to_store (struct regcache *arg0) override; > @@ -461,19 +461,19 @@ debug_target::commit_resume () > } > =20 > ptid_t > -target_ops::wait (ptid_t arg0, struct target_waitstatus *arg1, int arg= 2) > +target_ops::wait (ptid_t arg0, struct target_waitstatus *arg1, target_= wait_flags arg2) > { > return this->beneath ()->wait (arg0, arg1, arg2); > } > =20 > ptid_t > -dummy_target::wait (ptid_t arg0, struct target_waitstatus *arg1, int a= rg2) > +dummy_target::wait (ptid_t arg0, struct target_waitstatus *arg1, targe= t_wait_flags arg2) > { > return default_target_wait (this, arg0, arg1, arg2); > } > =20 > ptid_t > -debug_target::wait (ptid_t arg0, struct target_waitstatus *arg1, int a= rg2) > +debug_target::wait (ptid_t arg0, struct target_waitstatus *arg1, targe= t_wait_flags arg2) > { > ptid_t result; > fprintf_unfiltered (gdb_stdlog, "-> %s->wait (...)\n", this->beneath= ()->shortname ()); > @@ -483,7 +483,7 @@ debug_target::wait (ptid_t arg0, struct target_wait= status *arg1, int arg2) > fputs_unfiltered (", ", gdb_stdlog); > target_debug_print_struct_target_waitstatus_p (arg1); > fputs_unfiltered (", ", gdb_stdlog); > - target_debug_print_options (arg2); > + target_debug_print_target_wait_flags (arg2); > fputs_unfiltered (") =3D ", gdb_stdlog); > target_debug_print_ptid_t (result); > fputs_unfiltered ("\n", gdb_stdlog); > diff --git a/gdb/target.c b/gdb/target.c > index 58189e62024..9fd6b4ba9e1 100644 > --- a/gdb/target.c > +++ b/gdb/target.c > @@ -2007,7 +2007,8 @@ target_disconnect (const char *args, int from_tty= ) > /* See target/target.h. */ > =20 > ptid_t > -target_wait (ptid_t ptid, struct target_waitstatus *status, int option= s) > +target_wait (ptid_t ptid, struct target_waitstatus *status, > + target_wait_flags options) > { > return current_top_target ()->wait (ptid, status, options); > } > @@ -2017,7 +2018,7 @@ target_wait (ptid_t ptid, struct target_waitstatu= s *status, int options) > ptid_t > default_target_wait (struct target_ops *ops, > ptid_t ptid, struct target_waitstatus *status, > - int options) > + target_wait_flags options) > { > status->kind =3D TARGET_WAITKIND_IGNORE; > return minus_one_ptid; > @@ -3360,8 +3361,8 @@ str_comma_list_concat_elem (std::string *list, co= nst char *elem) > OPT is removed from TARGET_OPTIONS. */ > =20 > static void > -do_option (int *target_options, std::string *ret, > - int opt, const char *opt_str) > +do_option (target_wait_flags *target_options, std::string *ret, > + target_wait_flag opt, const char *opt_str) > { > if ((*target_options & opt) !=3D 0) > { > @@ -3373,7 +3374,7 @@ do_option (int *target_options, std::string *ret,= > /* See target.h. */ > =20 > std::string > -target_options_to_string (int target_options) > +target_options_to_string (target_wait_flags target_options) > { > std::string ret; > =20 > diff --git a/gdb/target.h b/gdb/target.h > index 71d575f2917..0cb92fa8ea8 100644 > --- a/gdb/target.h > +++ b/gdb/target.h > @@ -117,7 +117,7 @@ struct syscall > }; > =20 > /* Return a pretty printed form of TARGET_OPTIONS. */ > -extern std::string target_options_to_string (int target_options); > +extern std::string target_options_to_string (target_wait_flags target_= options); > =20 > /* Possible types of events that the inferior handler will have to > deal with. */ > @@ -488,7 +488,7 @@ struct target_ops > current target. inferior_ptid may also be null_ptid on > entry. */ > virtual ptid_t wait (ptid_t, struct target_waitstatus *, > - int TARGET_DEBUG_PRINTER (target_debug_print_options)) > + target_wait_flags options) > TARGET_DEFAULT_FUNC (default_target_wait); > virtual void fetch_registers (struct regcache *, int) > TARGET_DEFAULT_IGNORE (); > @@ -1456,7 +1456,7 @@ extern scoped_restore_tmpl make_scoped_defer= _target_commit_resume (); > extern ptid_t default_target_wait (struct target_ops *ops, > ptid_t ptid, > struct target_waitstatus *status, > - int options); > + target_wait_flags options); > =20 > /* Fetch at least register REGNO, or all regs if regno =3D=3D -1. No = result. */ > =20 > diff --git a/gdb/target/target.h b/gdb/target/target.h > index a66459c2469..393272b3273 100644 > --- a/gdb/target/target.h > +++ b/gdb/target/target.h > @@ -21,6 +21,8 @@ > #define TARGET_TARGET_H > =20 > #include "target/waitstatus.h" > +#include "target/wait.h" > + > /* This header is a stopgap until more code is shared. */ > =20 > /* Read LEN bytes of target memory at address MEMADDR, placing the > @@ -84,7 +86,7 @@ extern void target_continue (ptid_t ptid, enum gdb_si= gnal signal); > options. */ > =20 > extern ptid_t target_wait (ptid_t ptid, struct target_waitstatus *stat= us, > - int options); > + target_wait_flags options); > =20 > /* The inferior process has died. Do what is right. */ > =20 > diff --git a/gdb/target/wait.h b/gdb/target/wait.h > index d23b892700f..ee623bb7310 100644 > --- a/gdb/target/wait.h > +++ b/gdb/target/wait.h > @@ -20,11 +20,18 @@ > #ifndef TARGET_WAIT_H > #define TARGET_WAIT_H > =20 > +#include "gdbsupport/enum-flags.h" > + > /* Options that can be passed to target_wait. */ > =20 > -/* Return immediately if there's no event already queued. If this > - options is not requested, target_wait blocks waiting for an > - event. */ > -#define TARGET_WNOHANG 1 > +enum target_wait_flag : unsigned > +{ > + /* Return immediately if there's no event already queued. If this > + options is not requested, target_wait blocks waiting for an > + event. */ > + TARGET_WNOHANG =3D 1, > +}; > + > +DEF_ENUM_FLAGS_TYPE (enum target_wait_flag, target_wait_flags); > =20 > #endif /* TARGET_WAIT_H */ > diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c > index 188a920cbb0..b13129336ab 100644 > --- a/gdb/windows-nat.c > +++ b/gdb/windows-nat.c > @@ -310,7 +310,7 @@ struct windows_nat_target final : public x86_nat_ta= rget > =20 > void resume (ptid_t, int , enum gdb_signal) override; > =20 > - ptid_t wait (ptid_t, struct target_waitstatus *, int) override; > + ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) = override; > =20 > void fetch_registers (struct regcache *, int) override; > void store_registers (struct regcache *, int) override; > @@ -1774,7 +1774,7 @@ windows_nat_target::get_windows_debug_event (int = pid, > /* Wait for interesting events to occur in the target process. */ > ptid_t > windows_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourst= atus, > - int options) > + target_wait_flags options) > { > int pid =3D -1; > =20 > diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog > index 576c96e93b8..74e6f5cb03c 100644 > --- a/gdbserver/ChangeLog > +++ b/gdbserver/ChangeLog > @@ -1,3 +1,18 @@ > +2020-09-16 Tom Tromey > + > + * netbsd-low.h (class netbsd_process_target) : Update. > + * netbsd-low.cc (netbsd_waitpid, netbsd_wait) > + (netbsd_process_target::wait): Change type of target_options. > + * win32-low.h (class win32_process_target) : Update. > + * win32-low.cc (win32_process_target::wait): Update. > + * target.h (class process_stratum_target) : Update. > + (mywait): Update. > + * target.cc (mywait, target_wait): Change type of "options". > + * linux-low.h (class linux_process_target) : > + Update. > + * linux-low.cc (linux_process_target::wait) > + (linux_process_target::wait_1): Update. > + > 2020-09-15 Tom Tromey > =20 > * linux-x86-low.cc (xmltarget_i386_linux_no_xml) > diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc > index e45493339d2..70d5521d442 100644 > --- a/gdbserver/linux-low.cc > +++ b/gdbserver/linux-low.cc > @@ -2948,7 +2948,7 @@ linux_process_target::gdb_catch_this_syscall (lwp= _info *event_child) > =20 > ptid_t > linux_process_target::wait_1 (ptid_t ptid, target_waitstatus *ourstatu= s, > - int target_options) > + target_wait_flags target_options) > { > client_state &cs =3D get_client_state (); > int w; > @@ -3710,7 +3710,7 @@ async_file_mark (void) > ptid_t > linux_process_target::wait (ptid_t ptid, > target_waitstatus *ourstatus, > - int target_options) > + target_wait_flags target_options) > { > ptid_t event_ptid; > =20 > diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h > index 0ef659fb0f0..56c353319c2 100644 > --- a/gdbserver/linux-low.h > +++ b/gdbserver/linux-low.h > @@ -157,7 +157,7 @@ class linux_process_target : public process_stratum= _target > void resume (thread_resume *resume_info, size_t n) override; > =20 > ptid_t wait (ptid_t ptid, target_waitstatus *status, > - int options) override; > + target_wait_flags options) override; > =20 > void fetch_registers (regcache *regcache, int regno) override; > =20 > @@ -356,7 +356,7 @@ class linux_process_target : public process_stratum= _target > =20 > /* Wait for process, returns status. */ > ptid_t wait_1 (ptid_t ptid, target_waitstatus *ourstatus, > - int target_options); > + target_wait_flags target_options); > =20 > /* Stop all lwps that aren't stopped yet, except EXCEPT, if not NULL= =2E > If SUSPEND, then also increase the suspend count of every LWP, > diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc > index 8b13b6741e9..3eb2c0f25f6 100644 > --- a/gdbserver/netbsd-low.cc > +++ b/gdbserver/netbsd-low.cc > @@ -236,9 +236,11 @@ netbsd_store_waitstatus (struct target_waitstatus = *ourstatus, int hoststatus) > /* Implement a safe wrapper around waitpid(). */ > =20 > static pid_t > -netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus, int = options) > +netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus, > + target_wait_flags target_options) > { > int status; > + int options =3D (target_options & TARGET_WNOHANG) ? WNOHANG : 0; > =20 > pid_t pid > =3D gdb::handle_eintr (-1, ::waitpid, ptid.pid (), &status, o= ptions); > @@ -259,7 +261,7 @@ netbsd_waitpid (ptid_t ptid, struct target_waitstat= us *ourstatus, int options) > =20 > static ptid_t > netbsd_wait (ptid_t ptid, struct target_waitstatus *ourstatus, > - int target_options) > + target_wait_flags target_options) > { > pid_t pid =3D netbsd_waitpid (ptid, ourstatus, target_options); > ptid_t wptid =3D ptid_t (pid); > @@ -398,7 +400,7 @@ netbsd_wait (ptid_t ptid, struct target_waitstatus = *ourstatus, > =20 > ptid_t > netbsd_process_target::wait (ptid_t ptid, struct target_waitstatus *ou= rstatus, > - int target_options) > + target_wait_flags target_options) > { > while (true) > { > diff --git a/gdbserver/netbsd-low.h b/gdbserver/netbsd-low.h > index 3d2ec345a41..96ad6d92474 100644 > --- a/gdbserver/netbsd-low.h > +++ b/gdbserver/netbsd-low.h > @@ -76,7 +76,7 @@ class netbsd_process_target : public process_stratum_= target > void resume (thread_resume *resume_info, size_t n) override; > =20 > ptid_t wait (ptid_t ptid, target_waitstatus *status, > - int options) override; > + target_wait_flags options) override; > =20 > void fetch_registers (regcache *regcache, int regno) override; > =20 > diff --git a/gdbserver/target.cc b/gdbserver/target.cc > index 87f62a0b555..921d26fcf79 100644 > --- a/gdbserver/target.cc > +++ b/gdbserver/target.cc > @@ -160,8 +160,8 @@ target_write_memory (CORE_ADDR memaddr, const unsig= ned char *myaddr, > } > =20 > ptid_t > -mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,= > - int connected_wait) > +mywait (ptid_t ptid, struct target_waitstatus *ourstatus, > + target_wait_flags options, int connected_wait) > { > ptid_t ret; > =20 > @@ -220,7 +220,8 @@ target_stop_and_wait (ptid_t ptid) > /* See target/target.h. */ > =20 > ptid_t > -target_wait (ptid_t ptid, struct target_waitstatus *status, int option= s) > +target_wait (ptid_t ptid, struct target_waitstatus *status, > + target_wait_flags options) > { > return the_target->wait (ptid, status, options); > } > diff --git a/gdbserver/target.h b/gdbserver/target.h > index 13f069f7729..c2245ebfe85 100644 > --- a/gdbserver/target.h > +++ b/gdbserver/target.h > @@ -128,7 +128,7 @@ class process_stratum_target > no child stop to report, return is > null_ptid/TARGET_WAITKIND_IGNORE. */ > virtual ptid_t wait (ptid_t ptid, target_waitstatus *status, > - int options) =3D 0; > + target_wait_flags options) =3D 0; > =20 > /* Fetch registers from the inferior process. > =20 > @@ -663,8 +663,8 @@ target_read_btrace_conf (struct btrace_target_info = *tinfo, > #define target_supports_software_single_step() \ > the_target->supports_software_single_step () > =20 > -ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int o= ptions, > - int connected_wait); > +ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus, > + target_wait_flags options, int connected_wait); > =20 > /* Prepare to read or write memory from the inferior process. See the= > corresponding process_stratum_target methods for more details. */ > diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc > index a11cc740925..9980986c739 100644 > --- a/gdbserver/win32-low.cc > +++ b/gdbserver/win32-low.cc > @@ -1610,7 +1610,7 @@ get_child_debug_event (DWORD *continue_status, > Returns the signal which caused the process to stop. */ > ptid_t > win32_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,= > - int options) > + target_wait_flags options) > { > if (cached_status.kind !=3D TARGET_WAITKIND_IGNORE) > { > diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h > index f3b44776ae1..d4ad5d83d29 100644 > --- a/gdbserver/win32-low.h > +++ b/gdbserver/win32-low.h > @@ -116,7 +116,7 @@ class win32_process_target : public process_stratum= _target > void resume (thread_resume *resume_info, size_t n) override; > =20 > ptid_t wait (ptid_t ptid, target_waitstatus *status, > - int options) override; > + target_wait_flags options) override; > =20 > void fetch_registers (regcache *regcache, int regno) override; > =20 >=20 --XKDwolsZyAB8UidvV4ZfWODfh1v05RPuN-- --LacZUObY9sSHTgdJqJY23vfefzTlhk1Y1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEELaxVpweEzw+lMDwuS7MI6bAudmwFAl9k+fIACgkQS7MI6bAu dmzbJg/7BKHmXJc/o8MaycSpkJaHHW8ZSycDoMaDcO/oMHRF6QOFGQMWsDFXEuf0 5Hd74La84TA9248/HpJWf19s7fQlGXU5jUVevzSB+SVxJnVcnBXDNvM9Ro5D111g NCUvUIryvSZIQWgF0ANHAD0R/fm8oT/1/0g1N7d6iZ4iOBBS2S0LY6YASilkhkrr NOUIqF/UauHGcXKE9W5wXAusIkCH+u/RneZkJECCgRPf3K5KDRw2d6gF35P8bVgQ NMQOOjdTdIDqChOCSg/blNTfFcWquV5LueLrlXEJpZ/otz0hQx6rZ+1VMS0bOOxh hvloqixdLwBjIOU0HtZqbag0L0wkx3zKe2beE0Lw+NHtFCbanZqcd93TOHuuo7tB 2Gjl3jAdHho6Ysc7xI3V9pjbSu9GLZpYMi0p9R/XJ38KD2POasVErovF//KnfZuv PIl0j+mTeMz+QBtBEfMx2C8b372f8pOPAS3qVs7zjgVl6icEk0kCPNekxa5j5mFZ h1YXmzaBnHGdhVXp+sfIC8XJkJiCwEBwtzYbIpnJDEmEnQiIQDA/pBN58J+9Jroa WcUcGlz4lWSwPXilCi165VTuSwW1GUya2whRgvxOCIKIPll46aZttzs2JO+zmjnU TIC+tI5YiEKc4+FRDv16WVh4JPoBhh7ECqKvQ7vli6thFw7Dq8A= =qLUu -----END PGP SIGNATURE----- --LacZUObY9sSHTgdJqJY23vfefzTlhk1Y1--