Index: runtime/vm/atomic.h |
diff --git a/runtime/vm/atomic.h b/runtime/vm/atomic.h |
index bd489d0de36aec88030f1bc5edd88715e33db446..b427a981e6a97dc0b3d9f8d00077a464159a0c50 100644 |
--- a/runtime/vm/atomic.h |
+++ b/runtime/vm/atomic.h |
@@ -58,9 +58,15 @@ class AtomicOperations : public AllStatic { |
} // namespace dart |
+#if defined(USING_SIMULATOR) && !defined(TARGET_ARCH_DBC) |
+#define USING_SIMULATOR_ATOMICS |
+#endif |
+ |
+#if defined(USING_SIMULATOR_ATOMICS) |
// We need to use the simulator to ensure that atomic operations are observed |
// both in C++ and in generated code if the simulator is active. |
#include "vm/atomic_simulator.h" |
+#endif |
#if defined(TARGET_OS_ANDROID) |
#include "vm/atomic_android.h" |