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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/globals.h

Issue 1421253004: Use the iOS ABI when running SIMARM on Mac or targeting iOS. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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
« runtime/vm/constants_arm.h ('K') | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/intermediate_language_arm.cc » ('j') | runtime/vm/simulator_arm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/globals.h
diff --git a/runtime/vm/globals.h b/runtime/vm/globals.h
index dc7932ed2c157f7128d6f5deb6695595fb0dea16..77e486a17fdb55c765d3ae6c0affc128ef87dc70 100644
--- a/runtime/vm/globals.h
+++ b/runtime/vm/globals.h
@@ -109,7 +109,11 @@ static const uword kZapUninitializedWord = 0xabababababababab;
#elif defined(HOST_ARCH_X64)
#define COPY_FP_REGISTER(fp) asm volatile ("movq %%rbp, %0" : "=r" (fp) );
#elif defined(HOST_ARCH_ARM)
+# if defined(TARGET_OS_MAC)
+#define COPY_FP_REGISTER(fp) asm volatile ("mov %0, r7" : "=r" (fp) );
+# else
#define COPY_FP_REGISTER(fp) asm volatile ("mov %0, r11" : "=r" (fp) );
+# endif
#elif defined(HOST_ARCH_ARM64)
#define COPY_FP_REGISTER(fp) asm volatile ("mov %0, x29" : "=r" (fp) );
#elif defined(HOST_ARCH_MIPS)
« runtime/vm/constants_arm.h ('K') | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/intermediate_language_arm.cc » ('j') | runtime/vm/simulator_arm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698