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 499e33634bb7a581378948cd504ea347c4958080..d878d0512173328a603c910eecf65a508898c01a 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-09-07  Nick Clifton  <nickc@redhat.com>
 
        PR 28305

diff --git a/bfd/elf.c b/bfd/elf.c
index dea3bb00879fccd8ff6f4d2be93d841e8542d3dc..64e3f35a75c3f78ec9ba1cefff4aed6ffd8674e3 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -9592,23 +9592,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
@@ -10669,8 +10652,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 4fbc522715f66817bc52050af89e85c8442343c9..858df6570baea6d46a1b1de7b82191de7136f89e 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-08-11  Nick Clifton  <nickc@redhat.com>
 
        * po/pt.po: Updated Portuguese translation.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 4d33768e2bcc3fac91d8d200bf62798713f8329a..4a6fcff3cc1237a1c801cd8912c18eabf3fb1f33 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -18878,8 +18878,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 95ade894e98f361cfd82bd0a20a5c520015a0635..ebfb5541fb28ab62ff5d17def149b24e60b80e71 100644 (file)
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -694,12 +694,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.  */