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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 37fd0f9e127db314b07c5114dbeb2021e2f989a3..0e5c0685cc294f00533cf5501cc88ba9493ac49a 100644 (file)
--- 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 34b13354f32011fbca20afce3e2903c88aa7c58d..bc3e0049a91426436300947c62db720b4a74160b 100644 (file)
--- 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 984bbe2fabf4667ff1c04a30df0071351e561bb9..d0b43132b8e3be8bbd4eca2a75a6c0e0bbf575b5 100644 (file)
--- 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 81e2ea43a8689b24f60b4cde7aeb992daa5d3394..f00e424d464246d1cf41e48862935d23bee5ee03 100644 (file)
--- 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 63cae8afc069661cb49edbd70ee1176bc827f599..a572fc166c72e7a8f101301a9d2efbca58e57058 100644 (file)
--- 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 83b3d7ccccf8abb6656fbb12058917ca9265e700..082f5d437452c1668a16cc0e98d4a6e261dc2bc5 100644 (file)
--- 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);
     }
 }