From 8979927ae719d1a16d2acd01a11cc17ed3c78dfb Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 19 Feb 2018 18:48:15 +1030 Subject: [PATCH] Don't use %ll * dwarf2.c (read_section): Don't use 'll' format modifier. (find_abstract_instance): Likewise. * elfcore.h (elf_core_file_p): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/dwarf2.c | 8 ++++---- bfd/elfcore.h | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 349f212..8230981 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2018-02-19 Alan Modra + * dwarf2.c (read_section): Don't use 'll' format modifier. + (find_abstract_instance): Likewise. + * elfcore.h (elf_core_file_p): Likewise. + +2018-02-19 Alan Modra + * bfd-in.h: Include inttypes.h or if not available define PRId64, PRIu64 and PRIx64. * bfd.c (_bfd_doprnt, _bfd_doprnt_scan): Remove support for L diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index f956188..b0173e9 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -569,9 +569,9 @@ read_section (bfd * abfd, if (offset != 0 && offset >= *section_size) { /* xgettext: c-format */ - _bfd_error_handler (_("Dwarf Error: Offset (%llu)" + _bfd_error_handler (_("Dwarf Error: Offset (%" PRIu64 ")" " greater than or equal to %s size (%" PRIu64 ")."), - (long long) offset, section_name, + (uint64_t) offset, section_name, (uint64_t) *section_size); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -2871,8 +2871,8 @@ find_abstract_instance (struct comp_unit * unit, if (info_ptr == NULL) { _bfd_error_handler - (_("Dwarf Error: Unable to read alt ref %llu."), - (long long) die_ref); + (_("Dwarf Error: Unable to read alt ref %" PRIu64 "."), + (uint64_t) die_ref); bfd_set_error (bfd_error_bad_value); return FALSE; } diff --git a/bfd/elfcore.h b/bfd/elfcore.h index e0b39a7..117a1b7 100644 --- a/bfd/elfcore.h +++ b/bfd/elfcore.h @@ -298,8 +298,8 @@ elf_core_file_p (bfd *abfd) _bfd_error_handler /* xgettext:c-format */ (_("warning: %pB is truncated: expected core file " - "size >= %" PRIu64 ", found: %llu"), - abfd, (uint64_t) high, (unsigned long long) statbuf.st_size); + "size >= %" PRIu64 ", found: %" PRIu64), + abfd, (uint64_t) high, (uint64_t) statbuf.st_size); } } } -- 2.7.4