From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Sat, 24 Oct 2015 22:36:24 +0000 (-0400)
Subject: sparc64-tdep.c: Don't assign using memcpy return
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cfcb22a541ab8f783bf667cf7afbbfd9cd243cce;p=binutils-gdb.git

sparc64-tdep.c: Don't assign using memcpy return

This:

  valbuf = memcpy (buf, valbuf, len);

causes a build failure in C++, because memcpy returns the value of
"buf" as a void *.  Instead of adding a cast, we can just do the
assignment separately.

gdb/ChangeLog:

	* sparc64-tdep.c (sparc64_store_arguments): Split assignment of
	valbuf.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0a8a6933dcb..e86cbad67ec 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-24  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* sparc64-tdep.c (sparc64_store_arguments): Split assignment of
+	valbuf.
+
 2015-10-24  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* ia64-tdep.c (ia64_pseudo_register_write): Remove cast.
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 4c05277bf30..a23740e39cb 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -890,7 +890,8 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
 	  /* Structure, Union or long double Complex arguments.  */
 	  gdb_assert (len <= 16);
 	  memset (buf, 0, sizeof (buf));
-	  valbuf = memcpy (buf, valbuf, len);
+	  memcpy (buf, valbuf, len);
+	  valbuf = buf;
 
 	  if (element % 2 && sparc64_16_byte_align_p (type))
 	    element++;