[binutils-gdb] gdbserver/tracepoint: Add 'struct sockaddr_un *' -> 'struct sockaddr *' cast

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9a9df97001814c87929826e6538762f3be07c4a4

commit 9a9df97001814c87929826e6538762f3be07c4a4
Author: Pedro Alves <palves@redhat.com>
Date:   Mon Mar 9 11:29:56 2015 +0000

    gdbserver/tracepoint: Add 'struct sockaddr_un *' -> 'struct sockaddr *' cast
    
    Fixes this in C++ mode:
    
      gdb/gdbserver/tracepoint.c: In function â??void* gdb_agent_helper_thread(void*)â??:
      gdb/gdbserver/tracepoint.c:7190:47: error: cannot convert â??sockaddr_un*â?? to â??sockaddr*â?? for argument â??2â?? to â??int accept(int, sockaddr*, socklen_t*)â??
    	  fd = accept (listen_fd, &sockaddr, &tmp);
    
    gdb/gdbserver/ChangeLog:
    2015-03-09  Pedro Alves  <palves@redhat.com>
    
    	* tracepoint.c (gdb_agent_helper_thread): Cast '&sockaddr' to
    	'struct sockaddr' pointer in 'accept' call.

Diff:
---
 gdb/features/feature_to_c.sh | 0
 gdb/gdbserver/ChangeLog      | 5 +++++
 gdb/gdbserver/tracepoint.c   | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdb/features/feature_to_c.sh b/gdb/features/feature_to_c.sh
old mode 100644
new mode 100755
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index e26f123..d611bfd 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,10 @@
 2015-03-09  Pedro Alves  <palves@redhat.com>
 
+	* tracepoint.c (gdb_agent_helper_thread): Cast '&sockaddr' to
+	'struct sockaddr' pointer in 'accept' call.
+
+2015-03-09  Pedro Alves  <palves@redhat.com>
+
 	Revert:
 	2015-03-07  Pedro Alves  <palves@redhat.com>
 	* gdbreplay.c: No longer include <netinet/in.h>, <sys/socket.h>,
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 27fcf03..42b27c0 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -7174,7 +7174,7 @@ gdb_agent_helper_thread (void *arg)
 
 	  do
 	    {
-	      fd = accept (listen_fd, &sockaddr, &tmp);
+	      fd = accept (listen_fd, (struct sockaddr *) &sockaddr, &tmp);
 	    }
 	  /* It seems an ERESTARTSYS can escape out of accept.  */
 	  while (fd == -512 || (fd == -1 && errno == EINTR));