diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-04 05:39:54 -0500 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2017-03-06 14:55:38 +0000 |
| commit | e632003ca7d861b9e4325e836575410e59ad337c (patch) | |
| tree | 78d6f73f9f91a1e851fff10fbc6d9ebbf761d622 /gn/BUILD.gn | |
| parent | e395b9b879a941bba01d4ccc33c3d4cdfb4e8bef (diff) | |
Support Android NDK r14.
simpleperf has moved a little since r13. To support both, remove its
copy step.
Explicitly disable the Clang integrated assembler on MIPS. It has only
understood the 'usw' (unaligned store) pseudoinstruction for about 4
months, and that won't be part of a Clang release until the upcoming
Clang 4.0. Must be that -no-integrated-as was the default in r13.
All six platforms build on my laptop with r14 now.
Will follow up with the CL that moves the bots to r14.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-arm-Debug-Android,Build-Ubuntu-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-mips64el-Debug-Android,Build-Ubuntu-Clang-mipsel-Debug-Android,Build-Ubuntu-Clang-x64-Debug-Android,Build-Ubuntu-Clang-x86-Debug-Android,Build-Win-Clang-arm64-Release-Android
Change-Id: Ic00981d534613ebab8f6e7646b967493728b91d9
Reviewed-on: https://skia-review.googlesource.com/9237
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'gn/BUILD.gn')
| -rw-r--r-- | gn/BUILD.gn | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index aea5294977..9c1ee9e73a 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -126,6 +126,7 @@ config("default") { ] } else if (current_cpu == "mipsel") { cflags += [ + "-no-integrated-as", # Clang <4.0 doesn't understand 'usw' mnemonic. "-march=mips32r2", "-mdspr2", ] |