d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When merging the floating point type attribute, and reporting an error

Browse Source 
when things don't match, report which file has them and which one
doesn't correctly.

Differential Revision: https://reviews.freebsd.org/D2400
This commit is contained in:
Warner Losh 2015-05-03 22:51:29 +00:00
parent 3d9089a6f1
commit f321ea7845
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=282379
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/binutils/bfd/elf32-arm.c
View File

@ -6794,9 +6794,22 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
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;
}
}