[PATCH] D134969: [libunwind] Fix compile error with CROSS_UNWINDING

[Florian Mayer via Phabricator via llvm-commits]

fmayer created this revision.
Herald added projects: libunwind, All.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libunwind.
fmayer requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D134969

Files:
  libunwind/src/DwarfInstructions.hpp


Index: libunwind/src/DwarfInstructions.hpp
===================================================================
--- libunwind/src/DwarfInstructions.hpp
+++ libunwind/src/DwarfInstructions.hpp
@@ -202,7 +202,10 @@
       pint_t cfa = getCFA(addressSpace, prolog, registers);
 
       (void)stage2;
-#if defined(_LIBUNWIND_TARGET_AARCH64)
+    // __unw_step_stage2 is not used for cross unwinding, so we use __aarch64__
+    // rather than LIBUNWIND_TARGET_AARCH64 to make sure we are building for
+    // AArch64 natively.
+#if defined(__aarch64__)
       if (stage2 && cieInfo.mteTaggedFrame) {
         pint_t sp = registers.getSP();
         pint_t p = sp;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D134969.464292.patch
Type: text/x-patch
Size: 658 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220930/cf76d333/attachment.bin>