Revert: [AArch64] MTE corefile support

    bfd     * elf.c (elfcore_make_memtag_note_section): New function.
            (elfcore_grok_note): Handle NT_MEMTAG note types.

    binutils* readelf.c (get_note_type): Handle NT_MEMTAG note types.

    include * elf/common.h (NT_MEMTAG): New constant.
            (NT_MEMTAG_TYPE_AARCH_MTE): New constant.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b7ec6eafa23f7f31cdfb0029fb9ede9dc0c55290..8782224e8b8c76008df5a5307614d924638e6a33 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2021-09-07  Luis Machado  <luis.machado@linaro.org>
+
+       Revert: [AArch64] MTE corefile support
+
+       2021-05-21  Luis Machado  <luis.machado@linaro.org>
+
+       * elf.c (elfcore_make_memtag_note_section): New function.
+       (elfcore_grok_note): Handle NT_MEMTAG note types.
+
 2021-07-21  Nick Clifton  <nickc@redhat.com>
 
        * po/ru.po: Updated Russian translation.

diff --git a/bfd/elf.c b/bfd/elf.c
index 9c3f34c415b5f19ca764f76f5950191b50cdae7c..7a722841acf6666c183a432ead6bcc2d3cd07028 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -9599,23 +9599,6 @@ elfcore_make_auxv_note_section (bfd *abfd, Elf_Internal_Note *note,
   return true;
 }
 
-static bool
-elfcore_make_memtag_note_section (bfd *abfd, Elf_Internal_Note *note,
-                                 size_t offs)
-{
-  asection *sect = bfd_make_section_anyway_with_flags (abfd, ".memtag",
-                                                      SEC_HAS_CONTENTS);
-
-  if (sect == NULL)
-    return false;
-
-  sect->size = note->descsz - offs;
-  sect->filepos = note->descpos + offs;
-  sect->alignment_power = 1 + bfd_get_arch_size (abfd) / 32;
-
-  return true;
-}
-
 /* prstatus_t exists on:
      solaris 2.5+
      linux 2.[01] + glibc
@@ -10676,8 +10659,6 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note)
       return elfcore_make_note_pseudosection (abfd, ".note.linuxcore.siginfo",
                                              note);
 
-    case NT_MEMTAG:
-      return elfcore_make_memtag_note_section (abfd, note, 0);
     }
 }
 

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7869e1b9d2c5eb76904af9c4a1e23cda2f6a7298..eaa17e80f029e96443846f2af5a39e1f67eb6f26 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2021-09-07  Luis Machado  <luis.machado@linaro.org>
+
+       Revert: [AArch64] MTE corefile support
+
+       2021-05-21  Luis Machado  <luis.machado@linaro.org>
+
+       * readelf.c (get_note_type): Handle NT_MEMTAG note types.
+
 2021-07-16  Nick Clifton  <nickc@redhat.com>
 
        * po/sv.po: Updated Swedish translation.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index a6073f7ec8092e9a93542d20a953b9c0e87c301f..af10bcd0e170f1a3267a321571285c9d28ea2d9d 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -18843,8 +18843,6 @@ get_note_type (Filedata * filedata, unsigned e_type)
        return _("NT_SIGINFO (siginfo_t data)");
       case NT_FILE:
        return _("NT_FILE (mapped files)");
-      case NT_MEMTAG:
-       return _("NT_MEMTAG (memory tags)");
       default:
        break;
       }

diff --git a/include/ChangeLog b/include/ChangeLog
index 11001a3d1e31f6363106dc9db64233d48ec95aac..0e99cf39170d915d70f7f0b78e4962c4e853c8e0 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,12 @@
+2021-09-07  Luis Machado  <luis.machado@linaro.org>
+
+       Revert: [AArch64] MTE corefile support
+
+       2021-05-21  Luis Machado  <luis.machado@linaro.org>
+
+       * elf/common.h (NT_MEMTAG): New constant.
+       (NT_MEMTAG_TYPE_AARCH_MTE): New constant.
+
 2021-07-03  Nick Clifton  <nickc@redhat.com>
 
        * 2.37 release branch created.

diff --git a/include/elf/common.h b/include/elf/common.h
index 0cca28673dd63afd1c3eb821b1810fb3f2186e0a..7eefef9c7c4cb3f14379032aa7503ff0d026c16f 100644 (file)
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -685,12 +685,6 @@
 /* The range 0xff000000 to 0xffffffff is set aside for notes that don't
    originate from any particular operating system.  */
 #define NT_GDB_TDESC   0xff000000      /* Contains copy of GDB's target description XML.  */
-#define NT_MEMTAG      0xff000001      /* Contains a copy of the memory tags.  */
-
-/* NT_MEMTAG record types.  */
-
-/* ARM-specific NT_MEMTAG types.  */
-#define NT_MEMTAG_TYPE_AARCH_MTE  0x400        /* MTE memory tags for AArch64.  */
 
 /* Note segments for core files on dir-style procfs systems.  */