diff options
Diffstat (limited to 'gyp/dng_sdk.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. |