gdb-netbsd: Remove local patches for reg->xreg rename

[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 15:06:00 2020 +0100
Changeset:	7cbe0300e04f7ee16d2aad76bee79b0b92b15c90

Modified Files:
	gdb-netbsd/distinfo
Removed Files:
	gdb-netbsd/patches/patch-gdb_gdbserver_regcache.c
	gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.c
	gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.h
	gdb-netbsd/patches/patch-gdb_regformats_regdef.h

Log Message:
gdb-netbsd: Remove local patches for reg->xreg rename

Proper fix 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=7cbe0300e04f7ee16d2aad76bee79b0b92b15c90

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

diffstat:
 gdb-netbsd/distinfo                               |  4 ---
 gdb-netbsd/patches/patch-gdb_gdbserver_regcache.c | 25 --------------
 gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.c    | 13 --------
 gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.h    | 13 --------
 gdb-netbsd/patches/patch-gdb_regformats_regdef.h  | 40 -----------------------
 5 files changed, 95 deletions(-)

diffs:
diff --git a/gdb-netbsd/distinfo b/gdb-netbsd/distinfo
index 9893ea3938..8e801de1d5 100644
--- a/gdb-netbsd/distinfo
+++ b/gdb-netbsd/distinfo
@@ -28,9 +28,6 @@ SHA1 (patch-gdb_gdbserver_configure.srv) = d492edda5a6f7e70a2279ebe7409e557672b9
 SHA1 (patch-gdb_gdbserver_netbsd-low.c) = 6b79896787cfde6b1c7029e4ad7cd62e274dd23d
 SHA1 (patch-gdb_gdbserver_netbsd-low.h) = 4f4fe50c18f9d10ac842927860ab6418600881f3
 SHA1 (patch-gdb_gdbserver_netbsd-x86__64-low.c) = 487374f6ef2d8943b4b413b86f613411a3811f40
-SHA1 (patch-gdb_gdbserver_regcache.c) = 4967ab4c63b057d9b26c52be6e25d90e57a9fa06
-SHA1 (patch-gdb_gdbserver_tdesc.c) = 9682dafab7a4ff6870afb93d5979cc48a3512b88
-SHA1 (patch-gdb_gdbserver_tdesc.h) = dc701c237ec1102910ecd0dde47d23057a0d8f19
 SHA1 (patch-gdb_gdbsupport_agent.c) = d2ce6030a8c7d4fe84c74f3a44dc5c49f970547e
 SHA1 (patch-gdb_gdbsupport_common-defs.h) = 940d3489c2fac85defff29a0886f1c6d54bee020
 SHA1 (patch-gdb_gdbsupport_pathstuff.h) = 1eef4a97e827bc06fd4c11824435de0ccce076f8
@@ -52,7 +49,6 @@ SHA1 (patch-gdb_nbsd-tdep.c) = d375084ca0895e71a4f7b837cb633a11eb260884
 SHA1 (patch-gdb_nbsd-tdep.h) = ca419a41fa2e7c41c4a84521700dcfae279f4bfc
 SHA1 (patch-gdb_objfiles.c) = 25bcbc07b2a919db28c1145489e30dcb38b5a230
 SHA1 (patch-gdb_ppc-nbsd-nat.c) = 9986c45717729ffc4db04068296543e3449495a7
-SHA1 (patch-gdb_regformats_regdef.h) = a126d2537ade44f669a7a6bcd59dcd89188554d1
 SHA1 (patch-gdb_sh-nbsd-nat.c) = f316feea0192b6926ebe01d0fc83effe632ae063
 SHA1 (patch-gdb_sh-nbsd-tdep.c) = 868d765ebf6c2d4dfb1319653c9312da1ce45a8e
 SHA1 (patch-gdb_sh-nbsd-tdep.h) = 6dca499544ec3e95cd2c10a07926d1e80ab6d109
diff --git a/gdb-netbsd/patches/patch-gdb_gdbserver_regcache.c b/gdb-netbsd/patches/patch-gdb_gdbserver_regcache.c
deleted file mode 100644
index 008374b304..0000000000
--- a/gdb-netbsd/patches/patch-gdb_gdbserver_regcache.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- gdb/gdbserver/regcache.c.orig	2019-07-16 00:00:27.000000000 +0000
-+++ gdb/gdbserver/regcache.c
-@@ -198,7 +198,7 @@ regcache_cpy (struct regcache *dst, stru
- 
- /* Return a reference to the description of register N.  */
- 
--static const struct reg &
-+static const struct xreg &
- find_register_by_number (const struct target_desc *tdesc, int n)
- {
-   return tdesc->reg_defs[n];
-@@ -251,8 +251,10 @@ find_regno (const struct target_desc *td
- {
-   for (int i = 0; i < tdesc->reg_defs.size (); ++i)
-     {
--      if (strcmp (name, find_register_by_number (tdesc, i).name) == 0)
-+      if (strcmp (name, find_register_by_number (tdesc, i).name) == 0) {
-+        printf("%s(): regno='%s' i=%d\n", __func__, name, i);
- 	return i;
-+      }
-     }
-   internal_error (__FILE__, __LINE__, "Unknown register %s requested",
- 		  name);
diff --git a/gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.c b/gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.c
deleted file mode 100644
index d906307cce..0000000000
--- a/gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- gdb/gdbserver/tdesc.c.orig	2019-07-16 00:00:27.000000000 +0000
-+++ gdb/gdbserver/tdesc.c
-@@ -75,7 +75,7 @@ init_target_desc (struct target_desc *td
- 	gdb_assert (regnum == 0 || regnum >= tdesc->reg_defs.size ());
- 
- 	if (regnum != 0)
--	  tdesc->reg_defs.resize (regnum, reg (offset));
-+	  tdesc->reg_defs.resize (regnum, xreg (offset));
- 
- 	tdesc->reg_defs.emplace_back (treg->name.c_str (), offset,
- 				      treg->bitsize);
diff --git a/gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.h b/gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.h
deleted file mode 100644
index 1223933c4f..0000000000
--- a/gdb-netbsd/patches/patch-gdb_gdbserver_tdesc.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- gdb/gdbserver/tdesc.h.orig	2019-07-16 00:00:27.000000000 +0000
-+++ gdb/gdbserver/tdesc.h
-@@ -31,7 +31,7 @@ struct target_desc : tdesc_element
- {
-   /* A vector of elements of register definitions that
-      describe the inferior's register set.  */
--  std::vector<struct reg> reg_defs;
-+  std::vector<struct xreg> reg_defs;
- 
-   /* The register cache size, in bytes.  */
-   int registers_size;
diff --git a/gdb-netbsd/patches/patch-gdb_regformats_regdef.h b/gdb-netbsd/patches/patch-gdb_regformats_regdef.h
deleted file mode 100644
index 411ec88d1f..0000000000
--- a/gdb-netbsd/patches/patch-gdb_regformats_regdef.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- gdb/regformats/regdef.h.orig	2019-07-16 00:00:27.000000000 +0000
-+++ gdb/regformats/regdef.h
-@@ -19,15 +19,15 @@
- #ifndef REGFORMATS_REGDEF_H
- #define REGFORMATS_REGDEF_H
- 
--struct reg
-+struct xreg
- {
--  reg (int _offset)
-+  xreg (int _offset)
-     : name (""),
-       offset (_offset),
-       size (0)
-   {}
- 
--  reg (const char *_name, int _offset, int _size)
-+  xreg (const char *_name, int _offset, int _size)
-     : name (_name),
-       offset (_offset),
-       size (_size)
-@@ -47,14 +47,14 @@ struct reg
-   /* The size (in bits) of the value of this register, as transmitted.  */
-   int size;
- 
--  bool operator== (const reg &other) const
-+  bool operator== (const xreg &other) const
-   {
-     return (strcmp (name, other.name) == 0
- 	    && offset == other.offset
- 	    && size == other.size);
-   }
- 
--  bool operator!= (const reg &other) const
-+  bool operator!= (const xreg &other) const
-   {
-     return !(*this == other);
-   }