diff options
| author | imp <imp@FreeBSD.org> | 2015-05-03 22:51:29 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-05-03 22:51:29 +0000 |
| commit | 2fb926cf6f3787ea223f030dd19776a370e622c0 (patch) | |
| tree | 085a15e8e0efe0743904813b4bf0a2e270e4a009 /contrib/binutils | |
| parent | 0bf01bbf211b5da59c522437e99f43ad079eb06c (diff) | |
| download | FreeBSD-src-2fb926cf6f3787ea223f030dd19776a370e622c0.zip FreeBSD-src-2fb926cf6f3787ea223f030dd19776a370e622c0.tar.gz | |
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
Diffstat (limited to 'contrib/binutils')
| -rw-r--r-- | contrib/binutils/bfd/elf32-arm.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/contrib/binutils/bfd/elf32-arm.c b/contrib/binutils/bfd/elf32-arm.c index 4d7b486..31cf526 100644 --- a/contrib/binutils/bfd/elf32-arm.c +++ b/contrib/binutils/bfd/elf32-arm.c @@ -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; } } |
