diff options
| author | earthdok@chromium.org <earthdok@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-03-27 19:05:43 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-03-27 19:05:43 +0000 |
| commit | 67a841642657cfd799c8b84cbdd2b0b85811514a (patch) | |
| tree | c649536ceeee2fd03ce4f9da320bc1cbe50706b5 /libvpx.gyp | |
| parent | c0e7b209ec27447e4530c6ad8db4299b09142810 (diff) | |
| download | libvpx-67a841642657cfd799c8b84cbdd2b0b85811514a.tar.gz | |
libvpx: Disable assembly optimizations in MemorySanitizer builds.
Config/GYP change only (no pull from upstream).
R=tomfinegan@chromium.org
BUG=340754, 344505
Review URL: https://codereview.chromium.org/215053002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@259946 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'libvpx.gyp')
| -rw-r--r-- | libvpx.gyp | 55 |
1 files changed, 34 insertions, 21 deletions
@@ -13,14 +13,20 @@ 'asm_obj_extension': 'obj', }], - ['(target_arch=="arm" or target_arch=="armv7") and arm_neon==1', { - 'target_arch_full': 'arm-neon', + ['msan==1', { + 'target_arch_full': 'generic', }, { 'conditions': [ - ['OS=="android" and ((target_arch=="arm" or target_arch=="armv7") and arm_neon==0)', { - 'target_arch_full': 'arm-neon-cpu-detect', + ['(target_arch=="arm" or target_arch=="armv7") and arm_neon==1', { + 'target_arch_full': 'arm-neon', }, { - 'target_arch_full': '<(target_arch)', + 'conditions': [ + ['OS=="android" and ((target_arch=="arm" or target_arch=="armv7") and arm_neon==0)', { + 'target_arch_full': 'arm-neon-cpu-detect', + }, { + 'target_arch_full': '<(target_arch)', + }], + ], }], ], }], @@ -56,7 +62,7 @@ ['target_arch=="ia32"', { 'includes': ['libvpx_srcs_x86_intrinsics.gypi', ], }], - ['target_arch=="x64"', { + ['target_arch=="x64" and msan==0', { 'includes': ['libvpx_srcs_x86_64_intrinsics.gypi', ], }], [ '(target_arch=="arm" or target_arch=="armv7") and arm_neon==0 and OS=="android"', { @@ -126,21 +132,28 @@ ], }], ['target_arch=="x64"', { - 'includes': [ - 'libvpx_srcs_x86_64.gypi', - ], - 'dependencies': [ - 'libvpx_intrinsics_mmx', - 'libvpx_intrinsics_sse2', - # Currently no sse3 intrinsic functions - #'libvpx_intrinsics_sse3', - 'libvpx_intrinsics_ssse3', - # Currently no sse4_1 intrinsic functions - #'libvpx_intrinsics_sse4_1', - # Currently no avx intrinsic functions - #'libvpx_intrinsics_avx', - # Add avx2 support when VS2013 lands: crbug.com/328981 - #'libvpx_intrinsics_avx2', + 'conditions': [ + ['msan==1', { + 'includes': [ 'libvpx_srcs_generic.gypi', ], + }, { + 'includes': [ + 'libvpx_srcs_x86_64.gypi', + 'libvpx_srcs_nacl.gypi', + ], + 'dependencies': [ + 'libvpx_intrinsics_mmx', + 'libvpx_intrinsics_sse2', + # Currently no sse3 intrinsic functions + #'libvpx_intrinsics_sse3', + 'libvpx_intrinsics_ssse3', + # Currently no sse4_1 intrinsic functions + #'libvpx_intrinsics_sse4_1', + # Currently no avx intrinsic functions + #'libvpx_intrinsics_avx', + # Add avx2 support when VS2013 lands: crbug.com/328981 + #'libvpx_intrinsics_avx2', + ], + }], ], }], ['clang == 1', { |