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

Unified Diff: runtime/vm/simulator_arm.cc

Issue 2757783003: Set TARGET_OS_* from GN, falling back to HOST_OS_*. (Closed)
Patch Set: . Created 3 years, 9 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
Index: runtime/vm/simulator_arm.cc
diff --git a/runtime/vm/simulator_arm.cc b/runtime/vm/simulator_arm.cc
index 2b64e48248746dfac941bca56c2b00ec35441bd5..ce1f13a2b8455d9af77cfabd300609e11e9da50a 100644
--- a/runtime/vm/simulator_arm.cc
+++ b/runtime/vm/simulator_arm.cc
@@ -3776,7 +3776,7 @@ int64_t Simulator::Call(int32_t entry,
int32_t r6_val = get_register(R6);
int32_t r7_val = get_register(R7);
int32_t r8_val = get_register(R8);
-#if defined(TARGET_ABI_EABI)
+#if !defined(TARGET_OS_MACOS) && !TARGET_OS_IOS
int32_t r9_val = get_register(R9);
#endif
int32_t r10_val = get_register(R10);
@@ -3810,7 +3810,7 @@ int64_t Simulator::Call(int32_t entry,
set_register(R6, callee_saved_value);
set_register(R7, callee_saved_value);
set_register(R8, callee_saved_value);
-#if defined(TARGET_ABI_EABI)
+#if !defined(TARGET_OS_MACOS) && !TARGET_OS_IOS
set_register(R9, callee_saved_value);
#endif
set_register(R10, callee_saved_value);
@@ -3838,7 +3838,7 @@ int64_t Simulator::Call(int32_t entry,
ASSERT(callee_saved_value == get_register(R6));
ASSERT(callee_saved_value == get_register(R7));
ASSERT(callee_saved_value == get_register(R8));
-#if defined(TARGET_ABI_EABI)
+#if !defined(TARGET_OS_MACOS) && !TARGET_OS_IOS
ASSERT(callee_saved_value == get_register(R9));
#endif
ASSERT(callee_saved_value == get_register(R10));
@@ -3861,7 +3861,7 @@ int64_t Simulator::Call(int32_t entry,
set_register(R6, r6_val);
set_register(R7, r7_val);
set_register(R8, r8_val);
-#if defined(TARGET_ABI_EABI)
+#if !defined(TARGET_OS_MACOS) && !TARGET_OS_IOS
set_register(R9, r9_val);
#endif
set_register(R10, r10_val);

Powered by Google App Engine
This is Rietveld 408576698