gdb-netbsd: Drop {amd64,i386}-bsd-nat.c patches

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Mar 17 13:15:35 2020 +0100
Changeset:	18f7a93cc25be36f14d5a0af743dc7ac41bce5d6

Modified Files:
	gdb-netbsd/distinfo
Removed Files:
	gdb-netbsd/patches/patch-gdb_amd64-bsd-nat.c
	gdb-netbsd/patches/patch-gdb_i386-bsd-nat.c

Log Message:
gdb-netbsd: Drop {amd64,i386}-bsd-nat.c patches

Proper code is pending upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=18f7a93cc25be36f14d5a0af743dc7ac41bce5d6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gdb-netbsd/distinfo                          |   2 -
 gdb-netbsd/patches/patch-gdb_amd64-bsd-nat.c |  75 ------------------
 gdb-netbsd/patches/patch-gdb_i386-bsd-nat.c  | 110 ---------------------------
 3 files changed, 187 deletions(-)

diffs:
diff --git a/gdb-netbsd/distinfo b/gdb-netbsd/distinfo
index 9b346dcfc6..7a87986330 100644
--- a/gdb-netbsd/distinfo
+++ b/gdb-netbsd/distinfo
@@ -11,7 +11,6 @@ SHA1 (patch-gdb_aarch64-nbsd-tdep.c) = 7720b954f12031b60e1fa0a48ce668b104e09d41
 SHA1 (patch-gdb_aarch64-nbsd-tdep.h) = 814627b2b2ce5dc0dc095451183fbe03789f1513
 SHA1 (patch-gdb_alpha-nbsd-tdep.c) = 8fe9d1f08baa252b61b49c2672391c3349768444
 SHA1 (patch-gdb_alpha-tdep.c) = 9030c31dcef6660f58fc27e7979f0dae26e4f970
-SHA1 (patch-gdb_amd64-bsd-nat.c) = dea0bd38155f2a39f89f4f62dcbaf3e54ccd654f
 SHA1 (patch-gdb_amd64-nbsd-nat.c) = 26ad634a79441949c076cee07e4e5baaaa1402f1
 SHA1 (patch-gdb_amd64-nbsd-tdep.c) = 99328cdd390281ff298c08010907195738a85489
 SHA1 (patch-gdb_arm-nbsd-nat.c) = 09a21d2eed39dc4e74a1f442c6ee59dfbf9c6f54
@@ -40,7 +39,6 @@ SHA1 (patch-gdb_hppa-nbsd-nat.c) = eb5fb4b69f0ba69a4a7e8152bc97762a5b2cf1ba
 SHA1 (patch-gdb_hppa-nbsd-tdep.c) = 2b0552b3a8cb820daaf1fa3960cbbf6a31ad1c79
 SHA1 (patch-gdb_hppa-tdep.c) = 57e3a1cc1718aee0f70797804e8859af6c3c7840
 SHA1 (patch-gdb_hppa-tdep.h) = 6cda8a222cd10340ae54878998543e66f4455fd6
-SHA1 (patch-gdb_i386-bsd-nat.c) = b07545ddfd92b1ff479a42d28d21f2713748fa69
 SHA1 (patch-gdb_i386-bsd-nat.h) = f6688e75d80058832bbe12356399eec723f30328
 SHA1 (patch-gdb_i386-nbsd-nat.c) = 12583799f643f31849063acf10cb0dc36c68101f
 SHA1 (patch-gdb_i386-nbsd-tdep.c) = 002ece7989025a4bed1ce1eece9d225faf02c538
diff --git a/gdb-netbsd/patches/patch-gdb_amd64-bsd-nat.c b/gdb-netbsd/patches/patch-gdb_amd64-bsd-nat.c
deleted file mode 100644
index ec06f76e9d..0000000000
--- a/gdb-netbsd/patches/patch-gdb_amd64-bsd-nat.c
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
---- gdb/amd64-bsd-nat.c.orig	2019-07-16 00:00:27.000000000 +0000
-+++ gdb/amd64-bsd-nat.c
-@@ -51,7 +51,7 @@ amd64bsd_fetch_inferior_registers (struc
-     {
-       struct reg regs;
- 
--      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  inferior_ptid.lwp ()) == -1)
- 	perror_with_name (_("Couldn't get registers"));
- 
-       amd64_supply_native_gregset (regcache, &regs, -1);
-@@ -95,7 +95,7 @@ amd64bsd_fetch_inferior_registers (struc
-       if (x86bsd_xsave_len != 0)
- 	{
- 	  xstateregs = alloca (x86bsd_xsave_len);
--	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs, 0)
-+	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs,  inferior_ptid.lwp ())
- 	      == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
-@@ -104,7 +104,7 @@ amd64bsd_fetch_inferior_registers (struc
- 	}
- #endif
- 
--      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
-+      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  inferior_ptid.lwp ()) == -1)
- 	perror_with_name (_("Couldn't get floating point status"));
- 
-       amd64_supply_fxsave (regcache, -1, &fpregs);
-@@ -127,12 +127,12 @@ amd64bsd_store_inferior_registers (struc
-     {
-       struct reg regs;
- 
--      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  inferior_ptid.lwp ()) == -1)
-         perror_with_name (_("Couldn't get registers"));
- 
-       amd64_collect_native_gregset (regcache, &regs, regnum);
- 
--      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-+      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs,  inferior_ptid.lwp ()) == -1)
-         perror_with_name (_("Couldn't write registers"));
- 
-       if (regnum != -1)
-@@ -179,11 +179,11 @@ amd64bsd_store_inferior_registers (struc
-       if (x86bsd_xsave_len != 0)
- 	{
- 	  xstateregs = alloca (x86bsd_xsave_len);
--	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs, 0)
-+	  if (ptrace (PT_GETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs,  inferior_ptid.lwp ())
- 	      == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
--	  amd64_collect_xsave (regcache, regnum, xstateregs, 0);
-+	  amd64_collect_xsave (regcache, regnum, xstateregs,  inferior_ptid.lwp ());
- 
- 	  if (ptrace (PT_SETXSTATE, pid, (PTRACE_TYPE_ARG3) xstateregs,
- 		      x86bsd_xsave_len) == -1)
-@@ -192,12 +192,12 @@ amd64bsd_store_inferior_registers (struc
- 	}
- #endif
- 
--      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
-+      if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  inferior_ptid.lwp ()) == -1)
- 	perror_with_name (_("Couldn't get floating point status"));
- 
-       amd64_collect_fxsave (regcache, regnum, &fpregs);
- 
--      if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
-+      if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs,  inferior_ptid.lwp ()) == -1)
- 	perror_with_name (_("Couldn't write floating point status"));
-     }
- }
diff --git a/gdb-netbsd/patches/patch-gdb_i386-bsd-nat.c b/gdb-netbsd/patches/patch-gdb_i386-bsd-nat.c
deleted file mode 100644
index da5169e35d..0000000000
--- a/gdb-netbsd/patches/patch-gdb_i386-bsd-nat.c
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD$
-
---- gdb/i386-bsd-nat.c.orig	2019-07-16 00:00:27.000000000 +0000
-+++ gdb/i386-bsd-nat.c
-@@ -131,12 +131,13 @@ void
- i386bsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
- {
-   pid_t pid = get_ptrace_pid (regcache->ptid ());
-+  int lwp = regcache->ptid ().lwp ();
- 
-   if (regnum == -1 || GETREGS_SUPPLIES (regnum))
-     {
-       struct reg regs;
- 
--      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, lwp) == -1)
- 	perror_with_name (_("Couldn't get registers"));
- 
-       i386bsd_supply_gregset (regcache, &regs);
-@@ -185,7 +186,7 @@ i386bsd_fetch_inferior_registers (struct
- 
- 	  xstateregs = alloca (x86bsd_xsave_len);
- 	  if (ptrace (PT_GETXSTATE, pid,
--		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
-+		      (PTRACE_TYPE_ARG3) xstateregs, lwp) == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
- 	  i387_supply_xsave (regcache, -1, xstateregs);
-@@ -195,7 +196,7 @@ i386bsd_fetch_inferior_registers (struct
-       
- #ifdef HAVE_PT_GETXMMREGS
-       if (have_ptrace_xmmregs != 0
--	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
-+	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, lwp) == 0)
- 	{
- 	  have_ptrace_xmmregs = 1;
- 	  i387_supply_fxsave (regcache, -1, xmmregs);
-@@ -204,7 +205,7 @@ i386bsd_fetch_inferior_registers (struct
- 	{
- 	  have_ptrace_xmmregs = 0;
- #endif
--          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
-+          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, lwp) == -1)
- 	    perror_with_name (_("Couldn't get floating point status"));
- 
- 	  i387_supply_fsave (regcache, -1, &fpregs);
-@@ -221,17 +222,18 @@ void
- i386bsd_store_inferior_registers (struct regcache *regcache, int regnum)
- {
-   pid_t pid = get_ptrace_pid (regcache->ptid ());
-+  int lwp = regcache->ptid ().lwp ();
- 
-   if (regnum == -1 || GETREGS_SUPPLIES (regnum))
-     {
-       struct reg regs;
- 
--      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-+      if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) &regs, lwp) == -1)
-         perror_with_name (_("Couldn't get registers"));
- 
-       i386bsd_collect_gregset (regcache, &regs, regnum);
- 
--      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, 0) == -1)
-+      if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) &regs, lwp) == -1)
-         perror_with_name (_("Couldn't write registers"));
- 
-       if (regnum != -1)
-@@ -279,10 +281,10 @@ i386bsd_store_inferior_registers (struct
- 
- 	  xstateregs = alloca (x86bsd_xsave_len);
- 	  if (ptrace (PT_GETXSTATE, pid,
--		      (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
-+		      (PTRACE_TYPE_ARG3) xstateregs,  lwp) == -1)
- 	    perror_with_name (_("Couldn't get extended state status"));
- 
--	  i387_collect_xsave (regcache, -1, xstateregs, 0);
-+	  i387_collect_xsave (regcache, -1, xstateregs, lwp);
- 
- 	  if (ptrace (PT_SETXSTATE, pid,
- 		      (PTRACE_TYPE_ARG3) xstateregs, x86bsd_xsave_len) == -1)
-@@ -293,25 +295,25 @@ i386bsd_store_inferior_registers (struct
- 
- #ifdef HAVE_PT_GETXMMREGS
-       if (have_ptrace_xmmregs != 0
--	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
-+	  && ptrace(PT_GETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, lwp) == 0)
- 	{
- 	  have_ptrace_xmmregs = 1;
- 
- 	  i387_collect_fxsave (regcache, regnum, xmmregs);
- 
--	  if (ptrace (PT_SETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, 0) == -1)
-+	  if (ptrace (PT_SETXMMREGS, pid, (PTRACE_TYPE_ARG3) xmmregs, lwp) == -1)
-             perror_with_name (_("Couldn't write XMM registers"));
- 	}
-       else
- 	{
- 	  have_ptrace_xmmregs = 0;
- #endif
--          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
-+          if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, lwp) == -1)
- 	    perror_with_name (_("Couldn't get floating point status"));
- 
-           i387_collect_fsave (regcache, regnum, &fpregs);
- 
--          if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
-+          if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, lwp) == -1)
- 	    perror_with_name (_("Couldn't write floating point status"));
- #ifdef HAVE_PT_GETXMMREGS
-         }