+2021-05-12  Luis Machado  <luis.machado@linaro.org>
+
+       * elf-bfd.h (elfcore_write_aarch_mte): New prototype.
+       * elf.c (elfcore_grok_aarch_mte, elfcore_write_aarch_mte): New
+       functions.
+       (elfcore_grok_note): Handle notes of type NT_ARM_TAGGED_ADDR_CTRL.
+       (elfcore_write_register_note): Handle MTE notes.
+
 2021-05-11  Alan Modra  <amodra@gmail.com>
 
        PR 27844
 
   (bfd *, char *, int *, const void *, int);
 extern char *elfcore_write_aarch_pauth
   (bfd *, char *, int *, const void *, int);
+extern char *elfcore_write_aarch_mte
+  (bfd *, char *, int *, const void *, int);
 extern char *elfcore_write_arc_v2
   (bfd *, char *, int *, const void *, int);
 extern char *elfcore_write_riscv_csr
 
   return elfcore_make_note_pseudosection (abfd, ".reg-aarch-pauth", note);
 }
 
+static bool
+elfcore_grok_aarch_mte (bfd *abfd, Elf_Internal_Note *note)
+{
+  return elfcore_make_note_pseudosection (abfd, ".reg-aarch-mte",
+                                         note);
+}
+
 static bool
 elfcore_grok_arc_v2 (bfd *abfd, Elf_Internal_Note *note)
 {
       else
        return true;
 
+    case NT_ARM_TAGGED_ADDR_CTRL:
+      if (note->namesz == 6
+         && strcmp (note->namedata, "LINUX") == 0)
+       return elfcore_grok_aarch_mte (abfd, note);
+      else
+       return true;
+
     case NT_GDB_TDESC:
       if (note->namesz == 4
           && strcmp (note->namedata, "GDB") == 0)
                             note_name, NT_ARM_PAC_MASK, aarch_pauth, size);
 }
 
+char *
+elfcore_write_aarch_mte (bfd *abfd,
+                                     char *buf,
+                                     int *bufsiz,
+                                     const void *aarch_mte,
+                                     int size)
+{
+  char *note_name = "LINUX";
+  return elfcore_write_note (abfd, buf, bufsiz,
+                            note_name, NT_ARM_TAGGED_ADDR_CTRL,
+                            aarch_mte,
+                            size);
+}
+
 char *
 elfcore_write_arc_v2 (bfd *abfd,
                      char *buf,
     return elfcore_write_aarch_sve (abfd, buf, bufsiz, data, size);
   if (strcmp (section, ".reg-aarch-pauth") == 0)
     return elfcore_write_aarch_pauth (abfd, buf, bufsiz, data, size);
+  if (strcmp (section, ".reg-aarch-mte") == 0)
+    return elfcore_write_aarch_mte (abfd, buf, bufsiz, data, size);
   if (strcmp (section, ".reg-arc-v2") == 0)
     return elfcore_write_arc_v2 (abfd, buf, bufsiz, data, size);
   if (strcmp (section, ".gdb-tdesc") == 0)