From f6c4e3e8a3af94fbecce2a38d3fccc0980616c6d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 29 Aug 2018 15:33:23 -0600 Subject: [PATCH] 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 * csky-tdep.c (csky_analyze_prologue): Use core_addr_to_string_nz. --- gdb/ChangeLog | 5 +++++ gdb/csky-tdep.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 981ee14..d360c7c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2018-08-29 Tom Tromey + * csky-tdep.c (csky_analyze_prologue): Use + core_addr_to_string_nz. + +2018-08-29 Tom Tromey + * windows-nat.c (struct xlate_exception) : Change type to DWORD. (xlate): Fix formatting. Remove last entry. diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c index 972ac59..95bcead 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; -- 2.7.4