From 4360561f5a326d9765cf1d95e5f779c5ab51045e Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sun, 10 Jun 2018 08:24:04 -0600
Subject: [PATCH] Fix some missed "beneath" conversions

The buildbot pointed out that arm-linux-nat.c was not properly using
"beneath" as a method.  A search showed a few more places with this
issue.

Tested by the buildbot, though of course this only checked
arm-linux-nat.c.  Nevertheless I'm checking this in under the obvious
rule.

gdb/ChangeLog
2018-06-10  Tom Tromey  <tom@tromey.com>

	* procfs.c (procfs_target::xfer_partial): Use "beneath" as a
	method.
	* nto-procfs.c (nto_procfs_target::xfer_partial): Use "beneath" as
	a method.
	* go32-nat.c (go32_nat_target::xfer_partial): Use "beneath" as a
	method.
	* arm-linux-nat.c (arm_linux_nat_target::read_description): Use
	"beneath" as a method.
	* arm-fbsd-nat.c (arm_fbsd_nat_target::read_description):
	Use "beneath" as a method.
---
 gdb/ChangeLog       | 13 +++++++++++++
 gdb/arm-fbsd-nat.c  |  2 +-
 gdb/arm-linux-nat.c |  4 ++--
 gdb/go32-nat.c      |  6 +++---
 gdb/nto-procfs.c    |  6 +++---
 gdb/procfs.c        |  6 +++---
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 37fd0f9e127..0e5c0685cc2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2018-06-10  Tom Tromey  <tom@tromey.com>
+
+	* procfs.c (procfs_target::xfer_partial): Use "beneath" as a
+	method.
+	* nto-procfs.c (nto_procfs_target::xfer_partial): Use "beneath" as
+	a method.
+	* go32-nat.c (go32_nat_target::xfer_partial): Use "beneath" as a
+	method.
+	* arm-linux-nat.c (arm_linux_nat_target::read_description): Use
+	"beneath" as a method.
+	* arm-fbsd-nat.c (arm_fbsd_nat_target::read_description):
+	Use "beneath" as a method.
+
 2018-06-10  Tom Tromey  <tom@tromey.com>
 
 	* tracefile.c (struct trace_file_writer_deleter): New.
diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c
index 34b13354f32..bc3e0049a91 100644
--- a/gdb/arm-fbsd-nat.c
+++ b/gdb/arm-fbsd-nat.c
@@ -141,7 +141,7 @@ arm_fbsd_nat_target::read_description ()
 
   desc = arm_fbsd_read_description_auxv (this);
   if (desc == NULL)
-    desc = this->beneath->read_description ();
+    desc = this->beneath ()->read_description ();
   return desc;
 }
 
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index 984bbe2fabf..d0b43132b8e 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -553,7 +553,7 @@ arm_linux_nat_target::read_description ()
 
   if (target_auxv_search (this, AT_HWCAP, &arm_hwcap) != 1)
     {
-      return this->beneath->read_description ();
+      return this->beneath ()->read_description ();
     }
 
   if (arm_hwcap & HWCAP_IWMMXT)
@@ -586,7 +586,7 @@ arm_linux_nat_target::read_description ()
       return result;
     }
 
-  return this->beneath->read_description ();
+  return this->beneath ()->read_description ();
 }
 
 /* Information describing the hardware breakpoint capabilities.  */
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 81e2ea43a86..f00e424d464 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -655,9 +655,9 @@ go32_nat_target::xfer_partial (enum target_object object,
       return go32_xfer_memory (readbuf, writebuf, offset, len, xfered_len);
 
     default:
-      return this->beneath->xfer_partial (object, annex,
-					  readbuf, writebuf, offset, len,
-					  xfered_len);
+      return this->beneath ()->xfer_partial (object, annex,
+					     readbuf, writebuf, offset, len,
+					     xfered_len);
     }
 }
 
diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index 63cae8afc06..a572fc166c7 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -995,9 +995,9 @@ nto_procfs_target::xfer_partial (enum target_object object,
 	}
 	/* Fallthru */
     default:
-      return this->beneath->xfer_partial (object, annex,
-					  readbuf, writebuf, offset, len,
-					  xfered_len);
+      return this->beneath ()->xfer_partial (object, annex,
+					     readbuf, writebuf, offset, len,
+					     xfered_len);
     }
 }
 
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 83b3d7ccccf..082f5d43745 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -2574,9 +2574,9 @@ procfs_target::xfer_partial (enum target_object object,
 			       offset, len, xfered_len);
 
     default:
-      return this->beneath->xfer_partial (object, annex,
-					  readbuf, writebuf, offset, len,
-					  xfered_len);
+      return this->beneath ()->xfer_partial (object, annex,
+					     readbuf, writebuf, offset, len,
+					     xfered_len);
     }
 }
 
-- 
2.30.2