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

Unified Diff: runtime/vm/dart.cc

Issue 1982613003: Don't assume we want the iOS ABI if running simarm on Mac and the EABI otherwise. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 7 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/constants_arm.h ('k') | runtime/vm/disassembler_arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/dart.cc
diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
index 8fa693d0203cebffe8b4dd3edbfac2dae073e34e..f4821e4592fedf34ef53c025776c70c81572db56 100644
--- a/runtime/vm/dart.cc
+++ b/runtime/vm/dart.cc
@@ -617,10 +617,12 @@ const char* Dart::FeaturesString(Snapshot::Kind kind) {
// Generated code must match the host architecture and ABI.
#if defined(TARGET_ARCH_ARM)
-#if defined(TARGET_OS_MACOS)
+#if defined(TARGET_ABI_IOS)
buffer.AddString(" arm-ios");
-#else
+#elif defined(TARGET_ABI_EABI)
buffer.AddString(" arm-eabi");
+#else
+#error Unknown ABI
#endif
buffer.AddString(TargetCPUFeatures::hardfp_supported() ? " hardfp"
: " softfp");
« no previous file with comments | « runtime/vm/constants_arm.h ('k') | runtime/vm/disassembler_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698