diff mbox

[4/5] Eliminate spurious warnings from remote exec

Message ID 1436996979-32350-5-git-send-email-donb@codesourcery.com
State New
Headers show

Commit Message

Don Breazeal July 15, 2015, 9:49 p.m. UTC
This patch eliminates some spurious gdbserver warnings that occur when
following an exec event on extended-remote Linux targets.

When gdbserver on Linux sets up the hook for shared library load
detection, an initial step is to read the version number field of the
r_debug structure from memory.  In the current implementation, if the
version number is not equal to one, a warning is printed by gdbserver.
However, the number can be zero if the structure has not been 
initialized yet.  This seems to happen most of the time after an exec.

To suppress the warnings the error check was changed so that if
the version number is not equal to one the function silently returns
-1.  Subsequent calls to the routine find an initialized r_debug
structure.

Tested on x86_64 GNU/Linux, both GDB tests and manual testing which
followed an exec, then debugged a shared library loaded by the exec'd
program to ensure that there were no warnings and that debugging shared
libs was not adversely affected.

Thanks
--Don

2015-07-15  Don Breazeal  <donb@codesourcery.com>

	* gdb/gdbserver/linux-low.c (linux_qxfer_libraries_svr4):
	Return silently on r_debug version error instead of
	printing a warning.

---
 gdb/gdbserver/linux-low.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 47d8bc3..37eceb5 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -6421,10 +6421,16 @@  linux_qxfer_libraries_svr4 (const char *annex, unsigned char *readbuf,
 	{
 	  if (linux_read_memory (priv->r_debug + lmo->r_version_offset,
 				 (unsigned char *) &r_version,
-				 sizeof (r_version)) != 0
-	      || r_version != 1)
+				 sizeof (r_version)) != 0)
+	    warning ("error reading r_debug version from memory");
+	  else if (r_version != 1)
 	    {
-	      warning ("unexpected r_debug version %d", r_version);
+	      /* If the version is incorrect, it probably means that
+		 r_debug hasn't been initialized yet.  Just silently
+		 return an error.  We will try again in a subsequent
+		 pass through here, e.g. at the next library load
+		 event.  */
+	      return -1;
 	    }
 	  else if (read_one_ptr (priv->r_debug + lmo->r_map_offset,
 				 &lm_addr, ptr_size) != 0)