From owner-svn-src-all@FreeBSD.ORG Fri Oct 17 16:23:38 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB991D7; Fri, 17 Oct 2014 16:23:37 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDFACD1F; Fri, 17 Oct 2014 16:23:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9HGNb6O037980; Fri, 17 Oct 2014 16:23:37 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9HGNboH037976; Fri, 17 Oct 2014 16:23:37 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201410171623.s9HGNboH037976@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 17 Oct 2014 16:23:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r273232 - in stable/10/contrib/binutils/bfd: . po X-SVN-Group: stable-10 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.18-1 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: Fri, 17 Oct 2014 16:23:38 -0000 Author: emaste Date: Fri Oct 17 16:23:36 2014 New Revision: 273232 URL: https://svnweb.freebsd.org/changeset/base/273232 Log: MFC 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 Modified: stable/10/contrib/binutils/bfd/elf32-score.c stable/10/contrib/binutils/bfd/elflink.c stable/10/contrib/binutils/bfd/po/bfd.pot Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/binutils/bfd/elf32-score.c ============================================================================== --- stable/10/contrib/binutils/bfd/elf32-score.c Fri Oct 17 16:02:34 2014 (r273231) +++ stable/10/contrib/binutils/bfd/elf32-score.c Fri Oct 17 16:23:36 2014 (r273232) @@ -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: stable/10/contrib/binutils/bfd/elflink.c ============================================================================== --- stable/10/contrib/binutils/bfd/elflink.c Fri Oct 17 16:02:34 2014 (r273231) +++ stable/10/contrib/binutils/bfd/elflink.c Fri Oct 17 16:23:36 2014 (r273232) @@ -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: stable/10/contrib/binutils/bfd/po/bfd.pot ============================================================================== --- stable/10/contrib/binutils/bfd/po/bfd.pot Fri Oct 17 16:02:34 2014 (r273231) +++ stable/10/contrib/binutils/bfd/po/bfd.pot Fri Oct 17 16:23:36 2014 (r273232) @@ -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