diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-27 05:35:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-27 05:35:28 -0700 |
| commit | b464764dae4ffa40b880d96cdc368afd890a8a27 (patch) | |
| tree | 646b62d40dc3f8b4eb4bdc75e2199bfa337d8757 /gyp | |
| parent | 9f97882322929ee39405acb44cbf155854b38091 (diff) | |
Extend __mulodi4() hack to 32-bit x86.
This gets the Android-Clang-x86 perf bot from failing on __mulodi4() to failing on the next problem...
See https://luci-milo.appspot.com/swarming/task/3042e5f68636f810/steps/nanobench/0/stdout
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2190493002
Review-Url: https://codereview.chromium.org/2190493002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/dng_sdk.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp index be0c0f97db..05d6c25222 100644 --- a/gyp/dng_sdk.gyp +++ b/gyp/dng_sdk.gyp @@ -143,9 +143,9 @@ ['skia_os != "linux"', { 'sources': ['<@(headers)'], }], - ['skia_arch_type == "arm" and skia_clang_build', { + ['(skia_arch_type == "arm" or skia_arch_type == "x86") and skia_clang_build', { # DNG SDK uses __builtin_smulll_overflow() to detect 64x64 bit multiply overflow. - # On ARMv7, Clang implements this with __mulodi4() in libclang_rt. + # On ARMv7 and 32-bit x86, Clang implements this with __mulodi4() in libclang_rt. # I can't quite figure out how to link that here, so instead here's a shim for # __builtin_smulll_overflow() that multiplies normally assuming no overflow. # Tracked in b/29412086. |