From owner-svn-src-all@FreeBSD.ORG Tue Oct 29 04:25:51 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0AF5FA45; Tue, 29 Oct 2013 04:25:51 +0000 (UTC) (envelope-from rea@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1D4F26A8; Tue, 29 Oct 2013 04:25:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9T4PoPQ087896; Tue, 29 Oct 2013 04:25:50 GMT (envelope-from rea@svn.freebsd.org) Received: (from rea@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9T4PokD087893; Tue, 29 Oct 2013 04:25:50 GMT (envelope-from rea@svn.freebsd.org) Message-Id: <201310290425.r9T4PokD087893@svn.freebsd.org> From: Eygene Ryabinkin Date: Tue, 29 Oct 2013 04:25:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257302 - in head/contrib/binutils/bfd: . po X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2013 04:25:51 -0000 Author: rea (ports committer) Date: Tue Oct 29 04:25:49 2013 New Revision: 257302 URL: http://svnweb.freebsd.org/changeset/base/257302 Log: 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: dim MFC after: 2 weeks Modified: head/contrib/binutils/bfd/elf32-score.c head/contrib/binutils/bfd/elflink.c head/contrib/binutils/bfd/po/bfd.pot Modified: head/contrib/binutils/bfd/elf32-score.c ============================================================================== --- head/contrib/binutils/bfd/elf32-score.c Tue Oct 29 04:03:00 2013 (r257301) +++ head/contrib/binutils/bfd/elf32-score.c Tue Oct 29 04:25:49 2013 (r257302) @@ -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: head/contrib/binutils/bfd/elflink.c ============================================================================== --- head/contrib/binutils/bfd/elflink.c Tue Oct 29 04:03:00 2013 (r257301) +++ head/contrib/binutils/bfd/elflink.c Tue Oct 29 04:25:49 2013 (r257302) @@ -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: head/contrib/binutils/bfd/po/bfd.pot ============================================================================== --- head/contrib/binutils/bfd/po/bfd.pot Tue Oct 29 04:03:00 2013 (r257301) +++ head/contrib/binutils/bfd/po/bfd.pot Tue Oct 29 04:25:49 2013 (r257302) @@ -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