[PATCH 1/2] libelf: Sync elf.h from glibc.

[PATCH 1/2] libelf: Sync elf.h from glibc.

[Mark Wielaard]

Gets us DT_AARCH64_BTI_PLT and DT_AARCH64_PAC_PLT.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 libelf/ChangeLog | 4 ++++
 libelf/elf.h     | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 77044c1c..a3f15883 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2020-08-28  Mark Wielaard  <mark@klomp.org>
+
+	* elf.h: Update from glibc.
+
 2020-08-19  Mark Wielaard  <mark@klomp.org>
 
 	* elf32_updatenull.c (updatenull_wrlock): Fixup the sh_addralign
diff --git a/libelf/elf.h b/libelf/elf.h
index 197b557d..ff9f1dad 100644
--- a/libelf/elf.h
+++ b/libelf/elf.h
@@ -2875,6 +2875,8 @@ enum
 #define R_AARCH64_IRELATIVE	1032	/* STT_GNU_IFUNC relocation.  */
 
 /* AArch64 specific values for the Dyn d_tag field.  */
+#define DT_AARCH64_BTI_PLT	(DT_LOPROC + 1)
+#define DT_AARCH64_PAC_PLT	(DT_LOPROC + 3)
 #define DT_AARCH64_VARIANT_PCS	(DT_LOPROC + 5)
 #define DT_AARCH64_NUM		6
 
-- 
2.18.4

[PATCH 2/2] backends: Implement aarch64_dynamic_tag_name and aarch64_dynamic_tag_check

[Mark Wielaard]

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 backends/ChangeLog        |  7 +++++++
 backends/aarch64_init.c   |  2 ++
 backends/aarch64_symbol.c | 26 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/backends/ChangeLog b/backends/ChangeLog
index c85dfd2a..ce4c971e 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,10 @@
+2020-08-28  Mark Wielard  <mark@klomp.org>
+
+	* aarch64_init.c (aarch64_init): Hook dynamic_tag_name and
+	dynamic_tag_check.
+	* aarch64_symbol.c (aarch64_dynamic_tag_name): New function.
+	(aarch64_dynamic_tag_check): Likewise.
+
 2020-06-16  Mark Wielard  <mark@klomp.org>
 
 	* common-reloc.c (reloc_nametable): Make zero a 1 char array.
diff --git a/backends/aarch64_init.c b/backends/aarch64_init.c
index 66bfae94..bed92954 100644
--- a/backends/aarch64_init.c
+++ b/backends/aarch64_init.c
@@ -50,6 +50,8 @@ aarch64_init (Elf *elf __attribute__ ((unused)),
   HOOK (eh, reloc_simple_type);
   HOOK (eh, return_value_location);
   HOOK (eh, check_special_symbol);
+  HOOK (eh, dynamic_tag_name);
+  HOOK (eh, dynamic_tag_check);
   HOOK (eh, data_marker_symbol);
   HOOK (eh, abi_cfi);
 
diff --git a/backends/aarch64_symbol.c b/backends/aarch64_symbol.c
index e30c409d..464a5695 100644
--- a/backends/aarch64_symbol.c
+++ b/backends/aarch64_symbol.c
@@ -106,3 +106,29 @@ aarch64_data_marker_symbol (const GElf_Sym *sym, const char *sname)
 	  && GELF_ST_TYPE (sym->st_info) == STT_NOTYPE
 	  && (strcmp (sname, "$d") == 0 || strncmp (sname, "$d.", 3) == 0));
 }
+
+const char *
+aarch64_dynamic_tag_name (int64_t tag, char *buf __attribute__ ((unused)),
+			  size_t len __attribute__ ((unused)))
+{
+  switch (tag)
+    {
+    case DT_AARCH64_BTI_PLT:
+      return "AARCH64_BTI_PLT";
+    case DT_AARCH64_PAC_PLT:
+      return "AARCH64_PAC_PLT";
+    case DT_AARCH64_VARIANT_PCS:
+      return "AARCH64_VARIANT_PCS";
+    default:
+      break;
+    }
+  return NULL;
+}
+
+bool
+aarch64_dynamic_tag_check (int64_t tag)
+{
+  return (tag == DT_AARCH64_BTI_PLT
+	  || tag == DT_AARCH64_PAC_PLT
+	  || tag == DT_AARCH64_VARIANT_PCS);
+}
-- 
2.18.4

Re: [PATCH 1/2] libelf: Sync elf.h from glibc.

[Mark Wielaard]

On Sat, 2020-08-29 at 00:42 +0200, Mark Wielaard wrote:
> Gets us DT_AARCH64_BTI_PLT and DT_AARCH64_PAC_PLT.

Pushed.

Re: [PATCH 2/2] backends: Implement aarch64_dynamic_tag_name and aarch64_dynamic_tag_check

[Mark Wielaard]

On Sat, 2020-08-29 at 00:42 +0200, Mark Wielaard wrote:
> +2020-08-28  Mark Wielard  <mark@klomp.org>
> +
> +	* aarch64_init.c (aarch64_init): Hook dynamic_tag_name and
> +	dynamic_tag_check.
> +	* aarch64_symbol.c (aarch64_dynamic_tag_name): New function.
> +	(aarch64_dynamic_tag_check): Likewise.

Pushed.