From: Jim Wilson <jimw@sifive.com>
Date: Fri, 11 Oct 2019 18:26:29 +0000 (-0700)
Subject: RISC-V: Fix two ARI warnings.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a83d4ef693d2bda527c6b73c2580a6fcaf63462c;p=binutils-gdb.git

RISC-V: Fix two ARI warnings.

> gdb/riscv-tdep.c:1657: code: %ll: Do not use printf(%ll), instead use printf(%s,phex()) to dump a 'long long' value
gdb/riscv-tdep.c:1657:                  "Writing %lld-byte nop instruction to %s: %s\n",
> gdb/riscv-tdep.c:1658: code: long long: Do not use 'long long', instead use LONGEST
gdb/riscv-tdep.c:1658:                  ((unsigned long long) sizeof (nop_insn)),

fprintf_unfiltered doesn't support z (or j for that matter), and fixing that
is a larger patch than I'd like to write, so this does basically what the
ARI warnings recommends.  We don't need the cast as there is a prototype for
plongest.

	* riscv-tdep.c (riscv_push_dummy_code): Change %lld to %s and use
	plongest instead of unsigned long long cast.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fba57f3469b..3c1f87b32d2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Jim Wilson  <jimw@sifive.com>
+
+	* riscv-tdep.c (riscv_push_dummy_code): Change %lld to %s and use
+	plongest instead of unsigned long long cast.
+
 2019-10-10  Christian Biesinger  <cbiesinger@google.com>
 
 	* main.c (captured_main_1): Include gdbtk.h and remove declarations
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index e4a66f14293..003b230fcf6 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -1654,8 +1654,8 @@ riscv_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp,
 
   if (riscv_debug_breakpoints || riscv_debug_infcall)
     fprintf_unfiltered (gdb_stdlog,
-			"Writing %lld-byte nop instruction to %s: %s\n",
-			((unsigned long long) sizeof (nop_insn)),
+			"Writing %s-byte nop instruction to %s: %s\n",
+			plongest (sizeof (nop_insn)),
 			paddress (gdbarch, *bp_addr),
 			(status == 0 ? "success" : "failed"));