summaryrefslogtreecommitdiffstats
path: root/contrib/binutils
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2014-10-04 14:30:16 +0000
committerandrew <andrew@FreeBSD.org>2014-10-04 14:30:16 +0000
commit967689aeaf83ccf59f56031c433af5981c74c866 (patch)
tree642087ed6e9b0dff0d4f4e659c5fe010eab1a6e3 /contrib/binutils
parent753e16e52231722b9b58eb21a4a78d141236f4da (diff)
downloadFreeBSD-src-967689aeaf83ccf59f56031c433af5981c74c866.zip
FreeBSD-src-967689aeaf83ccf59f56031c433af5981c74c866.tar.gz
Silence a warning about Tag_Virtualization_use being unknown. We don't
handle merging this tag correctly, however it's unused.
Diffstat (limited to 'contrib/binutils')
-rw-r--r--contrib/binutils/bfd/elf32-arm.c3
-rw-r--r--contrib/binutils/include/elf/arm.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/binutils/bfd/elf32-arm.c b/contrib/binutils/bfd/elf32-arm.c
index 02dd21b..83acfe5 100644
--- a/contrib/binutils/bfd/elf32-arm.c
+++ b/contrib/binutils/bfd/elf32-arm.c
@@ -6965,7 +6965,8 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
for (; in_list; in_list = in_list->next)
{
- if ((in_list->tag & 128) < 64)
+ if ((in_list->tag & 128) < 64
+ && in_list->tag != Tag_Virtualization_use)
{
_bfd_error_handler
(_("Warning: %B: Unknown EABI object attribute %d"),
diff --git a/contrib/binutils/include/elf/arm.h b/contrib/binutils/include/elf/arm.h
index e701883..b10bb72 100644
--- a/contrib/binutils/include/elf/arm.h
+++ b/contrib/binutils/include/elf/arm.h
@@ -271,6 +271,8 @@ enum
Tag_ABI_optimization_goals,
Tag_ABI_FP_optimization_goals,
/* 32 is generic. */
+
+ Tag_Virtualization_use = 68,
};
#endif
OpenPOWER on IntegriCloud