[src/trunk]: src/external/gpl3/gdb/dist/gdb Undo local patches

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7e2d9cdf8f15
branches:  trunk
changeset: 976897:7e2d9cdf8f15
user:      kamil <kamil%NetBSD.org@localhost>
date:      Tue Oct 06 23:14:47 2020 +0000

description:
Undo local patches

They are no longer needed (and are wrong).

diffstat:

 external/gpl3/gdb/dist/gdb/inf-ptrace.c |  26 ++------------------------
 external/gpl3/gdb/dist/gdb/nbsd-nat.c   |   3 ---
 2 files changed, 2 insertions(+), 27 deletions(-)

diffs (79 lines):

diff -r b6afe70ad862 -r 7e2d9cdf8f15 external/gpl3/gdb/dist/gdb/inf-ptrace.c
--- a/external/gpl3/gdb/dist/gdb/inf-ptrace.c   Tue Oct 06 22:17:42 2020 +0000
+++ b/external/gpl3/gdb/dist/gdb/inf-ptrace.c   Tue Oct 06 23:14:47 2020 +0000
@@ -263,12 +263,10 @@
 {
   pid_t pid;
 
-#ifndef __NetBSD__
   /* If we have an LWPID to work with, use it.  Otherwise, we're
      dealing with a non-threaded program/target.  */
   pid = ptid.lwp ();
   if (pid == 0)
-#endif
     pid = ptid.pid ();
   return pid;
 }
@@ -293,7 +291,6 @@
   else
     request = PT_CONTINUE;
 
-  int sig;
   if (step)
     {
       /* If this system does not support PT_STEP, a higher level
@@ -302,23 +299,13 @@
         all possible successor instructions), so we don't have to
         worry about that here.  */
       request = PT_STEP;
-#if __NetBSD__
-      /*
-       * On NetBSD the data field of PT_STEP contains the thread
-       * to be stepped; all other threads are continued if this value is > 0
-       */
-      sig = ptid.lwp ();
-#else
-      sig = 0;
-#endif
-    } else
-      sig = gdb_signal_to_host (signal);
+    }
 
   /* An address of (PTRACE_TYPE_ARG3)1 tells ptrace to continue from
      where it was.  If GDB wanted it to start some other way, we have
      already written a new program counter value to the child.  */
   errno = 0;
-  gdb_ptrace (request, ptid, (PTRACE_TYPE_ARG3)1, sig);
+  gdb_ptrace (request, ptid, (PTRACE_TYPE_ARG3)1, gdb_signal_to_host (signal));
   if (errno != 0)
     perror_with_name (("ptrace"));
 }
@@ -476,15 +463,6 @@
        /* If the PT_IO request is somehow not supported, fallback on
           using PT_WRITE_D/PT_READ_D.  Otherwise we will return zero
           to indicate failure.  */
-       if (errno == EACCES)
-         {
-           fprintf_unfiltered (gdb_stderr, "Cannot %s process at %p (%s). "
-                               "Is PaX MPROTECT active? See security(7), "
-                               "sysctl(7), paxctl(8)\n", writebuf ? "write to" :
-                               "read from", piod.piod_offs,
-                               strerror(errno));
-           return TARGET_XFER_E_IO;    /* Some other error perhaps? */
-         }
        if (errno != EINVAL)
          return TARGET_XFER_EOF;
       }
diff -r b6afe70ad862 -r 7e2d9cdf8f15 external/gpl3/gdb/dist/gdb/nbsd-nat.c
--- a/external/gpl3/gdb/dist/gdb/nbsd-nat.c     Tue Oct 06 22:17:42 2020 +0000
+++ b/external/gpl3/gdb/dist/gdb/nbsd-nat.c     Tue Oct 06 23:14:47 2020 +0000
@@ -587,9 +587,6 @@
   siginfo_t *si = &psi.psi_siginfo;
 
   int lwp = psi.psi_lwpid;
-  // XXX: should the kernel return this?
-  if (lwp == 0)
-    lwp = pid;
 
   int signo = si->si_signo;
   const int code = si->si_code;