From 6fb4fe72859087ce37d6e040fb134156d53453e2 Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Wed, 8 Jun 2022 13:52:38 -0700 Subject: [PATCH] Revert "[ELF] Support 'G' in .eh_frame" This reverts commit 40f34fe4a87d5171854b9b65678ef3d9baea5785. --- lld/ELF/EhFrame.cpp | 4 ++-- lld/test/ELF/stack-tagging-cfi.s | 17 ----------------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 lld/test/ELF/stack-tagging-cfi.s diff --git a/lld/ELF/EhFrame.cpp b/lld/ELF/EhFrame.cpp index f2fc99f..794fe04 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 722cfc2..0000000 --- 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,@function -WithUnwind: - .cfi_startproc - .cfi_mte_tagged_frame - ret -.Lfunc_end0: - .size WithUnwind, .Lfunc_end0-WithUnwind - .cfi_endproc -- 2.7.4