commit 08ebcbe7b672a04e341cb3a88d8bf4276f96ac6e
author Florian Mayer <fmayer@google.com> Fri Sep 30 08:46:06 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Sep 30 12:06:27 2022 -0700
tree 18a05491311dd95d60cc8c3534666b5293769bcd
parent 2a62a0a2ac24d01612ef7a707dcb5494d1d5a728

[libunwind] Fix compile error with CROSS_UNWINDING

Reviewed By: #libunwind, MaskRay, mgorny

Differential Revision: https://reviews.llvm.org/D134969

NOKEYCHECK=True
GitOrigin-RevId: f5c9931fefcab8de07a6c08c39b582fa58859dc9

src/DwarfInstructions.hpp

diff --git a/src/DwarfInstructions.hpp b/src/DwarfInstructions.hpp
index 1901c8a..27432be 100644
--- a/src/DwarfInstructions.hpp
+++ b/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;