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

Unified Diff: include/core/SkOnce.h

Issue 216113005: Revert of ARM Skia NEON patches - 35 - First AArch64 support (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 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 | « gyp/opts.gyp ('k') | include/core/SkPreConfig.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkOnce.h
diff --git a/include/core/SkOnce.h b/include/core/SkOnce.h
index d5330b94087a1d52e2ce8336747e0642075f8523..daeb819d428408d36ef4cb7b72407d2a12fc01e9 100644
--- a/include/core/SkOnce.h
+++ b/include/core/SkOnce.h
@@ -85,10 +85,12 @@
#endif
inline static void full_barrier_on_arm() {
-#if (defined(SK_CPU_ARM) && SK_ARM_ARCH >= 7) || defined(SK_CPU_ARM64)
- asm volatile("dmb ish" : : : "memory");
-#elif defined(SK_CPU_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
}
« no previous file with comments | « gyp/opts.gyp ('k') | include/core/SkPreConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698