aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/elf32-arm.c1
-rw-r--r--binutils/readelf.c5
-rw-r--r--elfcpp/arm.h1
-rw-r--r--gas/config/tc-arm.c1
-rw-r--r--include/elf/arm.h1
5 files changed, 9 insertions, 0 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 7306104..98f9240 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -14614,6 +14614,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, struct bfd_link_info *info)
case Tag_MVE_arch:
case Tag_PAC_extension:
case Tag_BTI_extension:
+ case Tag_BTI_use:
/* Use the largest value specified. */
if (in_attr[i].i > out_attr[i].i)
out_attr[i].i = in_attr[i].i;
diff --git a/binutils/readelf.c b/binutils/readelf.c
index ce76076..5893be3 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -16149,6 +16149,10 @@ static const char * arm_attr_tag_BTI_extension[] =
"BTI instructions permitted in the NOP space",
"BTI instructions permitted in the NOP and in the non-NOP space"};
+static const char * arm_attr_tag_BTI_use[] =
+ {"Compiled without branch target enforcement",
+ "Compiled with branch target enforcement"};
+
#define LOOKUP(id, name) \
{id, #name, 0x80 | ARRAY_SIZE(arm_attr_tag_##name), arm_attr_tag_##name}
static arm_attr_public_tag arm_attr_public_tags[] =
@@ -16191,6 +16195,7 @@ static arm_attr_public_tag arm_attr_public_tags[] =
LOOKUP(48, MVE_arch),
LOOKUP(50, PAC_extension),
LOOKUP(52, BTI_extension),
+ LOOKUP(74, BTI_use),
{64, "nodefaults", 0, NULL},
{65, "also_compatible_with", 0, NULL},
LOOKUP(66, T2EE_use),
diff --git a/elfcpp/arm.h b/elfcpp/arm.h
index 42144ce..12ba3fa 100644
--- a/elfcpp/arm.h
+++ b/elfcpp/arm.h
@@ -308,6 +308,7 @@ enum
Tag_MVE_arch = 48,
Tag_PAC_extension = 50,
Tag_BTI_extension = 52,
+ Tag_BTI_use = 74,
Tag_nodefaults = 64,
Tag_also_compatible_with = 65,
Tag_T2EE_use = 66,
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 533419b..8a0fe8b 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -33518,6 +33518,7 @@ arm_convert_symbolic_attribute (const char *name)
T (Tag_MVE_arch),
T (Tag_PAC_extension),
T (Tag_BTI_extension),
+ T (Tag_BTI_use),
/* We deliberately do not include Tag_MPextension_use_legacy. */
#undef T
};
diff --git a/include/elf/arm.h b/include/elf/arm.h
index eb2ae9f..0f6e734 100644
--- a/include/elf/arm.h
+++ b/include/elf/arm.h
@@ -329,6 +329,7 @@ enum
Tag_MVE_arch = 48,
Tag_PAC_extension = 50,
Tag_BTI_extension = 52,
+ Tag_BTI_use = 74,
Tag_nodefaults = 64,
Tag_also_compatible_with,
Tag_T2EE_use,