[lld] 6fb4fe7 - Revert "[ELF] Support 'G' in .eh_frame"

[Florian Mayer via llvm-commits]

Author: Florian Mayer
Date: 2022-06-08T13:52:38-07:00
New Revision: 6fb4fe72859087ce37d6e040fb134156d53453e2

URL: https://github.com/llvm/llvm-project/commit/6fb4fe72859087ce37d6e040fb134156d53453e2
DIFF: https://github.com/llvm/llvm-project/commit/6fb4fe72859087ce37d6e040fb134156d53453e2.diff

LOG: Revert "[ELF] Support 'G' in .eh_frame"

This reverts commit 40f34fe4a87d5171854b9b65678ef3d9baea5785.

Added: 
    

Modified: 
    lld/ELF/EhFrame.cpp

Removed: 
    lld/test/ELF/stack-tagging-cfi.s


################################################################################
diff  --git a/lld/ELF/EhFrame.cpp b/lld/ELF/EhFrame.cpp
index f2fc99fe350c..794fe04346a9 100644
--- a/lld/ELF/EhFrame.cpp
+++ b/lld/ELF/EhFrame.cpp
@@ -171,7 +171,7 @@ uint8_t EhReader::getFdeEncoding() {
       readByte();
     else if (c == 'P')
       skipAugP();
-    else if (c != 'B' && c != 'S' && c != 'G')
+    else if (c != 'B' && c != 'S')
       failOn(aug.data(), "unknown .eh_frame augmentation string: " + aug);
   }
   return DW_EH_PE_absptr;
@@ -188,7 +188,7 @@ bool EhReader::hasLSDA() {
       skipAugP();
     else if (c == 'R')
       readByte();
-    else if (c != 'B' && c != 'S' && c != 'G')
+    else if (c != 'B' && c != 'S')
       failOn(aug.data(), "unknown .eh_frame augmentation string: " + aug);
   }
   return false;

diff  --git a/lld/test/ELF/stack-tagging-cfi.s b/lld/test/ELF/stack-tagging-cfi.s
deleted file mode 100644
index 722cfc21c4e8..000000000000
--- a/lld/test/ELF/stack-tagging-cfi.s
+++ /dev/null
@@ -1,17 +0,0 @@
-# RUN: llvm-mc -filetype=obj -triple aarch64 -mattr=+mte %s -o %t.o
-# RUN: ld.lld --eh-frame-hdr %t.o -o %t
-# RUN: llvm-objdump --dwarf=frames %t | FileCheck %s
-
-# CHECK: Augmentation:          "zRG"
-
-	.text
-	.globl	WithUnwind
-	.p2align	2
-	.type	WithUnwind, at function
-WithUnwind:
-	.cfi_startproc
-	.cfi_mte_tagged_frame
-	ret
-.Lfunc_end0:
-	.size	WithUnwind, .Lfunc_end0-WithUnwind
-	.cfi_endproc