diff options
| author | jzern <jzern@chromium.org> | 2014-12-11 11:32:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-11 19:33:56 +0000 |
| commit | 14bada710752470e889688b34f5b715a5c62680a (patch) | |
| tree | 52cc0942fafc0101ac66c0a99bb779abc6893a2f /third_party/libwebp | |
| parent | 089c07c966a9dc169f0822b90d92400bf23e19f7 (diff) | |
| download | chromium_src-14bada710752470e889688b34f5b715a5c62680a.zip chromium_src-14bada710752470e889688b34f5b715a5c62680a.tar.gz chromium_src-14bada710752470e889688b34f5b715a5c62680a.tar.bz2 | |
libwebp: cherry-pick non-Xcode clang (iOS) build fix
check for __apple_build_version__ to distinguish the two; a version
check could work as Apple bumped Xcode's to 5.x/6.x, but it's unclear
how upstream will deal with their versioning as they go 3.6+, so avoid
it for now.
Change-Id: I67cda67c4f68e262a92d805a63cc1496374be063
BUG=436897
Review URL: https://codereview.chromium.org/787333007
Cr-Commit-Position: refs/heads/master@{#307949}
Diffstat (limited to 'third_party/libwebp')
| -rw-r--r-- | third_party/libwebp/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/libwebp/dsp/enc_neon.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/third_party/libwebp/README.chromium b/third_party/libwebp/README.chromium index 485c05f..bdc4fdb 100644 --- a/third_party/libwebp/README.chromium +++ b/third_party/libwebp/README.chromium @@ -23,3 +23,4 @@ Local changes: Cherry-picks: Revert patch f7fc4bc: dec/webp.c: don't wait for data before reporting w/h 6638710 webp/types.h: use inline for clang++/-std=c++11 + a3946b8 enc_neon: fix building with non-Xcode clang (iOS) diff --git a/third_party/libwebp/dsp/enc_neon.c b/third_party/libwebp/dsp/enc_neon.c index 42041f73..bcab8ff 100644 --- a/third_party/libwebp/dsp/enc_neon.c +++ b/third_party/libwebp/dsp/enc_neon.c @@ -1013,7 +1013,8 @@ static int QuantizeBlock(int16_t in[16], int16_t out[16], const int16x8_t out1 = Quantize(in, mtx, 8); uint8x8x4_t shuffles; // vtbl4_u8 is marked unavailable for iOS arm64, use wider versions there. -#if defined(__APPLE__) && defined(__aarch64__) +#if defined(__APPLE__) && defined(__aarch64__) && \ + defined(__apple_build_version__) uint8x16x2_t all_out; INIT_VECTOR2(all_out, vreinterpretq_u8_s16(out0), vreinterpretq_u8_s16(out1)); INIT_VECTOR4(shuffles, |