diff options
| author | earthdok@chromium.org <earthdok@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-02-18 09:41:55 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-02-18 09:41:55 +0000 |
| commit | 966a02fd0c4047a6badca966cd77f1496b690447 (patch) | |
| tree | eea0b231bd4d9691463bda97e198e36caaeecd18 | |
| parent | 7220379786c6b814b6b887478fa440bb392e8251 (diff) | |
| download | libjpeg_turbo-966a02fd0c4047a6badca966cd77f1496b690447.tar.gz | |
Disable assembly optimizations in MemorySanitizer builds of libjpeg_turbo.
BUG=chromium:178409
NOTRY=true
Review URL: https://codereview.chromium.org/170323002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@251747 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | libjpeg.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp index 03dc537..8f4d193 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -136,7 +136,7 @@ 'simd/jsimdcpu.asm', ], }], - [ 'target_arch=="x64"', { + [ 'target_arch=="x64" and msan!=1', { 'sources': [ 'simd/jsimd_x86_64.c', 'simd/jccolss2-64.asm', @@ -156,6 +156,13 @@ 'simd/jiss2red-64.asm', ], }], + # MemorySanitizer doesn't support assembly code, so keep it disabled in + # MSan builds for now. + [ 'msan==1', { + 'sources': [ + 'jsimd_none.c', + ], + }], # The ARM SIMD implementation can be used for devices that support # the NEON instruction set. This can safely be done dynamically by # probing CPU features at runtime, if you wish. |