gdb/testsuite: make test names unique in gdb.python/py-format-string.exp

[deliverable/binutils-gdb.git] / gdb / fbsd-nat.c

diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index ac88fbc87f7d5228bafab51cad69d20ce5674526..22bdd7862921e75d24e36b08ffa73c33e7a263d6 100644 (file)
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for FreeBSD.
 
-   Copyright (C) 2002-2020 Free Software Foundation, Inc.
+   Copyright (C) 2002-2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -1048,7 +1048,7 @@ fbsd_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
       inferior *inf = find_inferior_ptid (this, ptid);
 
       for (thread_info *tp : inf->non_exited_threads ())
-        {
+       {
          int request;
 
          if (tp->ptid.lwp () == ptid.lwp ())
@@ -1166,7 +1166,7 @@ fbsd_handle_debug_trap (fbsd_nat_target *target, ptid_t ptid,
 
 ptid_t
 fbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
-                      int target_options)
+                      target_wait_flags target_options)
 {
   ptid_t wptid;
 
@@ -1335,7 +1335,6 @@ fbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
 #endif
 #endif
 
-#ifdef PL_FLAG_EXEC
          if (pl.pl_flags & PL_FLAG_EXEC)
            {
              ourstatus->kind = TARGET_WAITKIND_EXECD;
@@ -1343,7 +1342,6 @@ fbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
                = xstrdup (pid_to_exec_file (pid));
              return wptid;
            }
-#endif
 
 #ifdef USE_SIGTRAP_SIGINFO
          if (fbsd_handle_debug_trap (this, wptid, pl))
@@ -1508,9 +1506,7 @@ fbsd_nat_target::post_attach (int pid)
   fbsd_add_threads (this, pid);
 }
 
-#ifdef PL_FLAG_EXEC
-/* If the FreeBSD kernel supports PL_FLAG_EXEC, then traced processes
-   will always stop after exec.  */
+/* Traced processes always stop after exec.  */
 
 int
 fbsd_nat_target::insert_exec_catchpoint (int pid)
@@ -1523,7 +1519,6 @@ fbsd_nat_target::remove_exec_catchpoint (int pid)
 {
   return 0;
 }
-#endif
 
 #ifdef HAVE_STRUCT_PTRACE_LWPINFO_PL_SYSCALL_CODE
 int