From c1cf5c00893871f5391aa335952097b9406651b3 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 24 Oct 2013 14:25:22 +0000 Subject: Borrow Android's ARMv6 memory barrier for SkOnce. BUG=skia:1743 R=bungeman@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/34353009 git-svn-id: http://skia.googlecode.com/svn/trunk@11941 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkOnce.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/SkOnce.h') diff --git a/src/core/SkOnce.h b/src/core/SkOnce.h index ddef0d56c4..a469e22c86 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 } -- cgit v1.2.3