From: Tom Tromey <tom@tromey.com>
Date: Wed, 29 Aug 2018 21:33:23 +0000 (-0600)
Subject: Use core_addr_to_string_nz in csky_analyze_prologue
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6c4e3e8a3af94fbecce2a38d3fccc0980616c6d;p=binutils-gdb.git

Use core_addr_to_string_nz in csky_analyze_prologue

One of the buildbot builders had a failure on a recent try run:

../../binutils-gdb/gdb/csky-tdep.c: In function CORE_ADDR csky_analyze_prologue(gdbarch*, CORE_ADDR, CORE_ADDR, CORE_ADDR, frame_info*, csky_unwind_cache*, lr_type_t):
../../binutils-gdb/gdb/csky-tdep.c:1107:23: error: format %lx expects argument of type long unsigned int, but argument 3 has type CORE_ADDR {aka long long unsigned int} [-Werror=format=]
        "0x%lx\n", addr);
                       ^
../../binutils-gdb/gdb/csky-tdep.c:1419:12: error: format %lx expects argument of type long unsigned int, but argument 3 has type CORE_ADDR {aka long long unsigned int} [-Werror=format=]
        addr);
            ^

The fix is to use core_addr_to_string_nz rather than %lx in
csky-tdep.c.

Tested by rebuilding.  I'm checking this in.

gdb/ChangeLog
2018-08-29  Tom Tromey  <tom@tromey.com>

	* csky-tdep.c (csky_analyze_prologue): Use
	core_addr_to_string_nz.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 981ee1405e4..d360c7c4b86 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-29  Tom Tromey  <tom@tromey.com>
+
+	* csky-tdep.c (csky_analyze_prologue): Use
+	core_addr_to_string_nz.
+
 2018-08-29  Tom Tromey  <tom@tromey.com>
 
 	* windows-nat.c (struct xlate_exception) <them>: Change type to
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 972ac59affe..95bcead8771 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -1103,8 +1103,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 					  "csky: found stack adjustment of"
 					  " 0x%x bytes.\n", adjust);
 		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: skipping to new address "
-					  "0x%lx\n", addr);
+					  "csky: skipping to new address %s\n",
+					  core_addr_to_string_nz (addr));
 		      fprintf_unfiltered (gdb_stdlog,
 					  "csky: continuing\n");
 		    }
@@ -1415,8 +1415,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 					  "found stack adjustment of 0x%x"
 					  " bytes.\n", adjust);
 		      fprintf_unfiltered (gdb_stdlog, "csky: "
-					  "skipping to new address 0x%lx\n",
-					  addr);
+					  "skipping to new address %s\n",
+					  core_addr_to_string_nz (addr));
 		      fprintf_unfiltered (gdb_stdlog, "csky: continuing\n");
 		    }
 		  continue;