Skip to content

Commit dfea14a

Browse files
authored
Merge pull request #69913 from finagolfin/arm
[Backtracing][Android] Fix armv7 build
2 parents d17a098 + d9d6356 commit dfea14a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

stdlib/public/runtime/CrashHandlerLinux.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,11 @@ handle_fatal_signal(int signum,
243243
#elif defined(__arm64__) || defined(__aarch64__)
244244
pc = (void *)(ctx->uc_mcontext.pc);
245245
#elif defined(__arm__)
246+
#if defined(__ANDROID__)
247+
pc = (void *)(ctx->uc_mcontext.arm_pc);
248+
#else
246249
pc = (void *)(ctx->uc_mcontext.gprs[15]);
250+
#endif
247251
#endif
248252

249253
_swift_displayCrashMessage(signum, pc);

0 commit comments

Comments
 (0)