Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Unified Diff: runtime/vm/signal_handler_linux.cc

Issue 1105263003: Fix unsimulated ARM64 build. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/signal_handler_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/signal_handler_linux.cc
diff --git a/runtime/vm/signal_handler_linux.cc b/runtime/vm/signal_handler_linux.cc
index 960b417fc3717b1b2ee1196c8dabb763bf3214e5..2d7b74d16084143bf819a8923858b6fb1e27cf93 100644
--- a/runtime/vm/signal_handler_linux.cc
+++ b/runtime/vm/signal_handler_linux.cc
@@ -113,7 +113,7 @@ uintptr_t SignalHandler::GetLinkRegister(const mcontext_t& mcontext) {
#elif defined(TARGET_ARCH_ARM)
lr = static_cast<uintptr_t>(mcontext.arm_lr);
#elif defined(TARGET_ARCH_ARM64)
- lr = static_cast<uintptr_t>(mcontext.lr);
+ lr = static_cast<uintptr_t>(mcontext.regs[30]);
#elif defined(TARGET_ARCH_MIPS)
lr = static_cast<uintptr_t>(mcontext.gregs[31]);
#else
« no previous file with comments | « runtime/vm/signal_handler_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698