From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 17 Mar 2023 08:27:41 +0000 (+0100)
Subject: [libunwind][AArch64] Unbreak building with GNU assembler
X-Git-Tag: upstream/17.0.6~14495
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d276380b0b45c3f02ef3c8614c3be95ce1bcb1e;p=platform%2Fupstream%2Fllvm.git

[libunwind][AArch64] Unbreak building with GNU assembler

GNU assembler mandates armv8.5-a for memtag instructions. Maybe
we should remove this restriction in GNU assembler, but let's work
around it for current GNU Binutils releases.

Differential Revision: https://reviews.llvm.org/D146109
---

diff --git a/libunwind/src/DwarfInstructions.hpp b/libunwind/src/DwarfInstructions.hpp
index 27432be56133..9962c2ffa0ca 100644
--- a/libunwind/src/DwarfInstructions.hpp
+++ b/libunwind/src/DwarfInstructions.hpp
@@ -224,7 +224,8 @@ int DwarfInstructions<A, R>::stepWithDwarf(A &addressSpace, pint_t pc,
         p &= ~0xfULL;
         // CFA is the bottom of the current stack frame.
         for (; p < cfa; p += 16) {
-          __asm__ __volatile__(".arch_extension memtag\n"
+          __asm__ __volatile__(".arch armv8.5-a\n"
+                               ".arch_extension memtag\n"
                                "stg %[Ptr], [%[Ptr]]\n"
                                :
                                : [Ptr] "r"(p)