diff options
| author | Andrea Corallo <andrea.corallo@arm.com> | 2021-07-05 17:14:47 +0200 |
|---|---|---|
| committer | Andrea Corallo <andrea.corallo@arm.com> | 2021-08-17 14:49:42 +0200 |
| commit | b81ee92f0349038a4575bf2e1f5321ac63a6ac48 (patch) | |
| tree | a81bc800a357d54cedf279617cc70dfcee52e168 | |
| parent | 4b535030189e7b6c5f26d0881f883665b54f124c (diff) | |
PATCH [3/4] arm: Add Tag_BTI_use build attribute
bfd/
2021-07-06 Andrea Corallo <andrea.corallo@arm.com>
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Add
'Tag_BTI_use' case.
binutils/
2021-07-06 Andrea Corallo <andrea.corallo@arm.com>
* readelf.c (arm_attr_tag_PAC_extension): Declare.
(arm_attr_public_tags): Add 'PAC_extension' lookup.
elfcpp/
2021-07-06 Andrea Corallo <andrea.corallo@arm.com>
* arm.h: Define 'Tag_BTI_use' enum.
gas/
2021-07-06 Andrea Corallo <andrea.corallo@arm.com>
* config/tc-arm.c (arm_convert_symbolic_attribute): Add
'Tag_BTI_use' to the attribute_table.
include/
2021-07-06 Andrea Corallo <andrea.corallo@arm.com>
* elf/arm.h (elf_arm_reloc_type): Add 'Tag_BTI_use'.
| -rw-r--r-- | bfd/elf32-arm.c | 1 | ||||
| -rw-r--r-- | binutils/readelf.c | 5 | ||||
| -rw-r--r-- | elfcpp/arm.h | 1 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 1 | ||||
| -rw-r--r-- | include/elf/arm.h | 1 |
5 files changed, 9 insertions, 0 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 73061047e2..98f9240194 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 ce76076eaa..5893be36c2 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 42144ce13b..12ba3fa7a1 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 533419b95b..8a0fe8b312 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 eb2ae9f430..0f6e734e6d 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, |