Chromium Code Reviews| Index: src/core/SkOnce.h |
| diff --git a/src/core/SkOnce.h b/src/core/SkOnce.h |
| index ddef0d56c438abbfed1870ae2460e6d743c627f4..a469e22c86246d681f4acbbab0da404223d01e48 100644 |
| --- a/src/core/SkOnce.h |
| +++ b/src/core/SkOnce.h |
| @@ -64,7 +64,11 @@ inline static void compiler_barrier() { |
| inline static void full_barrier_on_arm() { |
| #ifdef SK_CPU_ARM |
| +#if SK_ARM_ARCH >= 7 |
| asm volatile("dmb" : : : "memory"); |
| +#else |
| + asm volatile("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); |
| +#endif |
| #endif |
| } |