diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2014-10-04 14:30:16 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2014-10-04 14:30:16 +0000 |
| commit | e0d0c7b8f369b6b975cfe28b684718c608b938da (patch) | |
| tree | 642087ed6e9b0dff0d4f4e659c5fe010eab1a6e3 /contrib/binutils | |
| parent | 92720216a934288de13f3de464731bc0bf194985 (diff) | |
Notes
Diffstat (limited to 'contrib/binutils')
| -rw-r--r-- | contrib/binutils/bfd/elf32-arm.c | 3 | ||||
| -rw-r--r-- | contrib/binutils/include/elf/arm.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/binutils/bfd/elf32-arm.c b/contrib/binutils/bfd/elf32-arm.c index 02dd21b59468..83acfe564714 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 e70188338786..b10bb72eb643 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 |