Author: emaste
Date: Fri Oct 17 16:32:27 2014
New Revision: 273233
URL: https://svnweb.freebsd.org/changeset/base/273233
Log:
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
Modified:
releng/10.1/contrib/binutils/bfd/elf32-score.c
releng/10.1/contrib/binutils/bfd/elflink.c
releng/10.1/contrib/binutils/bfd/po/bfd.pot
Directory Properties:
releng/10.1/ (props changed)
Modified: releng/10.1/contrib/binutils/bfd/elf32-score.c
==============================================================================
--- releng/10.1/contrib/binutils/bfd/elf32-score.c Fri Oct 17 16:23:36
2014 (r273232)
+++ releng/10.1/contrib/binutils/bfd/elf32-score.c Fri Oct 17 16:32:27
2014 (r273233)
@@ -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;
}
Modified: releng/10.1/contrib/binutils/bfd/elflink.c
==============================================================================
--- releng/10.1/contrib/binutils/bfd/elflink.c Fri Oct 17 16:23:36 2014
(r273232)
+++ releng/10.1/contrib/binutils/bfd/elflink.c Fri Oct 17 16:32:27 2014
(r273233)
@@ -4357,8 +4357,8 @@ elf_link_add_object_symbols (bfd *abfd,
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;
}
Modified: releng/10.1/contrib/binutils/bfd/po/bfd.pot
==============================================================================
--- releng/10.1/contrib/binutils/bfd/po/bfd.pot Fri Oct 17 16:23:36 2014
(r273232)
+++ releng/10.1/contrib/binutils/bfd/po/bfd.pot Fri Oct 17 16:32:27 2014
(r273233)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
