| Index: runtime/vm/atomic.h
|
| diff --git a/runtime/vm/atomic.h b/runtime/vm/atomic.h
|
| index 026762f2c611871a87bb8883c166a6f5f370617e..c182a8445a9ee707faa8f4a0f5b41dbda1b8199f 100644
|
| --- a/runtime/vm/atomic.h
|
| +++ b/runtime/vm/atomic.h
|
| @@ -65,9 +65,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"
|
|
|