aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--public.bzl6
1 files changed, 4 insertions, 2 deletions
diff --git a/public.bzl b/public.bzl
index b07f2d8875..d66781b534 100644
--- a/public.bzl
+++ b/public.bzl
@@ -131,7 +131,9 @@ def opts_cflags(opts):
elif opts == SKIA_OPTS_NEON:
return ["-mfpu=neon"]
elif opts == SKIA_OPTS_CRC32:
- return ["-march=armv8-a+crc"]
+ # NDK r11's Clang (3.8) doesn't pass along this -march setting correctly to an external
+ # assembler, so we do it manually with -Wa. This is just a bug, fixed in later Clangs.
+ return ["-march=armv8-a+crc", "-Wa,-march=armv8-a+crc"]
else:
return []
@@ -176,7 +178,7 @@ def skia_opts_deps(cpu):
if cpu == SKIA_CPU_ARM64:
res += [":opts_crc32"]
-
+
if cpu == SKIA_CPU_X86:
res += [
":opts_sse2",