sys-devel/gdb: fix sparc-nat build

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

2 files changed, 48 insertions, 0 deletions

diff --git a/sys-devel/gdb/files/gdb-10.2-sparc-nat.patch b/sys-devel/gdb/files/gdb-10.2-sparc-nat.patch
new file mode 100644
index 000000000000..5e71efa0d33a
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-10.2-sparc-nat.patch
@@ -0,0 +1,47 @@
+From 288e3189fce8f466ca60411c27e8f1c0dac5d582 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Sun, 25 Apr 2021 20:50:38 +0100
+Subject: [PATCH] gdb: fix sparc build failure of linux-nat
+
+On sparc build failed as:
+
+```
+gdb/sparc-linux-nat.c: In member function
+  'virtual void sparc_linux_nat_target::fetch_registers(regcache*, int)':
+gdb/sparc-linux-nat.c:36:37:
+  error: cannot convert 'regcache*' to 'process_stratum_target*'
+   36 |   { sparc_fetch_inferior_registers (regcache, regnum); }
+      |                                     ^~~~~~~~
+      |                                     |
+      |                                     regcache*
+```
+
+The fix adopts gdb/sparc-nat.h API change in d1e93af64a6
+("gdb: set current thread in sparc_{fetch,collect}_inferior_registers").
+
+gdb/ChangeLog:
+
+	* sparc-linux-nat.c (sparc_linux_nat_target): fix sparc build
+	by passing `process_stratum_target*` parameter.
+---
+ gdb/sparc-linux-nat.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/gdb/sparc-linux-nat.c
++++ b/gdb/sparc-linux-nat.c
+@@ -33,10 +33,10 @@ class sparc_linux_nat_target final : public linux_nat_target
+ public:
+   /* Add our register access methods.  */
+   void fetch_registers (struct regcache *regcache, int regnum) override
+-  { sparc_fetch_inferior_registers (regcache, regnum); }
++  { sparc_fetch_inferior_registers (this, regcache, regnum); }
+ 
+   void store_registers (struct regcache *regcache, int regnum) override
+-  { sparc_store_inferior_registers (regcache, regnum); }
++  { sparc_store_inferior_registers (this, regcache, regnum); }
+ };
+ 
+ static sparc_linux_nat_target the_sparc_linux_nat_target;
+-- 
+2.31.1
+
diff --git a/sys-devel/gdb/gdb-10.2.ebuild b/sys-devel/gdb/gdb-10.2.ebuild
index 520501f00231..f826ccb70838 100644
--- a/sys-devel/gdb/gdb-10.2.ebuild
+++ b/sys-devel/gdb/gdb-10.2.ebuild
@@ -86,6 +86,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
 	"${FILESDIR}"/${PN}-10.1-cet.patch
+	"${FILESDIR}"/${PN}-10.2-sparc-nat.patch
 )
 
 pkg_setup() {