aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/elf32-arm.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e3729bb..9b33ac5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-16 Andre Vieira <andre.simoesdiasvieira@arm.com>
+
+ * elf32-arm.c (elf32_arm_merge_eabi_attributes): Add case for Tag_MVE_arch.
+
2019-05-16 Alan Modra <amodra@gmail.com>
* elf32-arm.c (elf32_arm_write_section): Revert last change.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 337961d..418458c 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -14713,6 +14713,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, struct bfd_link_info *info)
case Tag_CPU_unaligned_access:
case Tag_T2EE_use:
case Tag_MPextension_use:
+ case Tag_MVE_arch:
/* Use the largest value specified. */
if (in_attr[i].i > out_attr[i].i)
out_attr[i].i = in_attr[i].i;