Date: Sun, 3 May 2015 22:51:30 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282379 - head/contrib/binutils/bfd Message-ID: <201505032251.t43MpUlE071791@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun May 3 22:51:29 2015 New Revision: 282379 URL: https://svnweb.freebsd.org/changeset/base/282379 Log: When merging the floating point type attribute, and reporting an error when things don't match, report which file has them and which one doesn't correctly. Differential Revision: https://reviews.freebsd.org/D2400 Modified: head/contrib/binutils/bfd/elf32-arm.c Modified: head/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- head/contrib/binutils/bfd/elf32-arm.c Sun May 3 22:49:47 2015 (r282378) +++ head/contrib/binutils/bfd/elf32-arm.c Sun May 3 22:51:29 2015 (r282379) @@ -6794,9 +6794,22 @@ elf32_arm_merge_eabi_attributes (bfd *ib out_attr[Tag_ABI_VFP_args].i = in_attr[Tag_ABI_VFP_args].i; else if (in_attr[Tag_ABI_FP_number_model].i != 0) { + bfd *hasbfd, *hasnotbfd; + + if (in_attr[Tag_ABI_VFP_args].i) + { + hasbfd = ibfd; + hasnotbfd = obfd; + } + else + { + hasbfd = obfd; + hasnotbfd = ibfd; + } + _bfd_error_handler (_("ERROR: %B uses VFP register arguments, %B does not"), - ibfd, obfd); + hasbfd, hasnotbfd); return FALSE; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505032251.t43MpUlE071791>