From: Andrea Corallo <andrea.corallo@arm.com>
Date: Mon, 5 Jul 2021 14:37:19 +0000 (+0200)
Subject: PATCH [2/4] arm: Add Tag_BTI_extension build attribute
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b535030189e7b6c5f26d0881f883665b54f124c;p=binutils-gdb.git

PATCH [2/4] arm: Add Tag_BTI_extension build attribute

bfd/
2021-07-06  Andrea Corallo  <andrea.corallo@arm.com>

	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Add
	'Tag_BTI_extension' 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_extension' enum.

gas/
2021-07-06  Andrea Corallo  <andrea.corallo@arm.com>

	* config/tc-arm.c (arm_convert_symbolic_attribute): Add
	'Tag_BTI_extension' to the attribute_table.

include/
2021-07-06  Andrea Corallo  <andrea.corallo@arm.com>

	* elf/arm.h (elf_arm_reloc_type): Add 'Tag_BTI_extension'.
---

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index bb4ba89357e..73061047e29 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -14613,6 +14613,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, struct bfd_link_info *info)
 	case Tag_MPextension_use:
 	case Tag_MVE_arch:
 	case Tag_PAC_extension:
+	case Tag_BTI_extension:
 	  /* 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 d38a07f0fa5..ce76076eaa0 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -16144,6 +16144,11 @@ static const char * arm_attr_tag_PAC_extension[] =
    "PAC/AUT instructions permitted in the NOP space",
    "PAC/AUT instructions permitted in the NOP and in the non-NOP space"};
 
+static const char * arm_attr_tag_BTI_extension[] =
+  {"BTI instructions not permitted",
+   "BTI instructions permitted in the NOP space",
+   "BTI instructions permitted in the NOP and in the non-NOP space"};
+
 #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[] =
@@ -16185,6 +16190,7 @@ static arm_attr_public_tag arm_attr_public_tags[] =
   LOOKUP(46, DSP_extension),
   LOOKUP(48, MVE_arch),
   LOOKUP(50, PAC_extension),
+  LOOKUP(52, BTI_extension),
   {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 ce682a5bdc6..42144ce13be 100644
--- a/elfcpp/arm.h
+++ b/elfcpp/arm.h
@@ -307,6 +307,7 @@ enum
   Tag_DIV_use = 44,
   Tag_MVE_arch = 48,
   Tag_PAC_extension = 50,
+  Tag_BTI_extension = 52,
   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 2827e2949c3..533419b95b1 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -33517,6 +33517,7 @@ arm_convert_symbolic_attribute (const char *name)
       T (Tag_DSP_extension),
       T (Tag_MVE_arch),
       T (Tag_PAC_extension),
+      T (Tag_BTI_extension),
       /* We deliberately do not include Tag_MPextension_use_legacy.  */
 #undef T
     };
diff --git a/include/elf/arm.h b/include/elf/arm.h
index 27b676860dd..eb2ae9f4301 100644
--- a/include/elf/arm.h
+++ b/include/elf/arm.h
@@ -328,6 +328,7 @@ enum
   Tag_DSP_extension = 46,
   Tag_MVE_arch = 48,
   Tag_PAC_extension = 50,
+  Tag_BTI_extension = 52,
   Tag_nodefaults = 64,
   Tag_also_compatible_with,
   Tag_T2EE_use,