From 3169778a2f7cfe0b8db8a34efe39520d73a20492 Mon Sep 17 00:00:00 2001 From: emaste Date: Fri, 17 Oct 2014 16:32:27 +0000 Subject: [PATCH] MFS10 r273232 (HEAD r257302 by rea): binutils/bfd: fix printf-like format strings for "bfd *" arguments There is a special format argument '%B' that directly handles values of type 'bfd *', they must be used instead of '%s'. Manifestations of this bug can be seen in ld(1) error messages, for example, http://lists.freebsd.org/pipermail/freebsd-current/2013-August/043580.html http://lists.freebsd.org/pipermail/freebsd-current/2013-October/045404.html Approved by: re git-svn-id: svn://svn.freebsd.org/base/releng/10.1@273233 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/binutils/bfd/elf32-score.c | 2 +- contrib/binutils/bfd/elflink.c | 4 ++-- contrib/binutils/bfd/po/bfd.pot | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/binutils/bfd/elf32-score.c b/contrib/binutils/bfd/elf32-score.c index 070177b15..2c8a633e0 100644 --- a/contrib/binutils/bfd/elf32-score.c +++ b/contrib/binutils/bfd/elf32-score.c @@ -2546,7 +2546,7 @@ _bfd_score_elf_check_relocs (bfd *abfd, } else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr)) { - (*_bfd_error_handler) (_("%s: Malformed reloc detected for section %s"), abfd, name); + (*_bfd_error_handler) (_("%B: Malformed reloc detected for section %s"), abfd, name); bfd_set_error (bfd_error_bad_value); return FALSE; } diff --git a/contrib/binutils/bfd/elflink.c b/contrib/binutils/bfd/elflink.c index f5c989d7a..e80f8ee3f 100644 --- a/contrib/binutils/bfd/elflink.c +++ b/contrib/binutils/bfd/elflink.c @@ -4357,8 +4357,8 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) { (*_bfd_error_handler) - (_("%s: invalid DSO for symbol `%s' definition"), - abfd, name); + (_("%B: invalid DSO for symbol `%s' definition"), + abfd, name); bfd_set_error (bfd_error_bad_value); goto error_free_vers; } diff --git a/contrib/binutils/bfd/po/bfd.pot b/contrib/binutils/bfd/po/bfd.pot index a01ee3716..e5282389a 100644 --- a/contrib/binutils/bfd/po/bfd.pot +++ b/contrib/binutils/bfd/po/bfd.pot @@ -1572,7 +1572,7 @@ msgstr "" #: elf32-score.c:2549 #, c-format -msgid "%s: Malformed reloc detected for section %s" +msgid "%B: Malformed reloc detected for section %s" msgstr "" #: elf32-score.c:2600 @@ -2440,7 +2440,7 @@ msgstr "" #: elflink.c:4309 #, c-format -msgid "%s: invalid DSO for symbol `%s' definition" +msgid "%B: invalid DSO for symbol `%s' definition" msgstr "" #: elflink.c:5535 -- 2.45.0