diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 19:11:32 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 19:11:32 +0000 |
| commit | a42caffa71b3ea2b1ac481588353caa816795e08 (patch) | |
| tree | d2309eb110d9ab4f1d02495135195a70db92ef0c | |
| parent | 519747478eda3c08f5a311041d020f28940559d0 (diff) | |
| download | chromium_src-a42caffa71b3ea2b1ac481588353caa816795e08.zip chromium_src-a42caffa71b3ea2b1ac481588353caa816795e08.tar.gz chromium_src-a42caffa71b3ea2b1ac481588353caa816795e08.tar.bz2 | |
Enables win64 build of yuv_convert_simd_x86 without rolling x86inc.asm forward.
BUG=172129, 166496
Review URL: https://codereview.chromium.org/12036108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179379 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/base/simd/x86inc.asm | 2 | ||||
| -rw-r--r-- | media/media.gyp | 18 | ||||
| -rw-r--r-- | third_party/yasm/yasm_compile.gypi | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/media/base/simd/x86inc.asm b/media/base/simd/x86inc.asm index 223ea3d..c8b87bf 100644 --- a/media/base/simd/x86inc.asm +++ b/media/base/simd/x86inc.asm @@ -41,6 +41,8 @@ %ifdef ARCH_X86_64 %ifidn __OUTPUT_FORMAT__,win32 %define WIN64 + %elifidn __OUTPUT_FORMAT__,win64 + %define WIN64 %else %define UNIX64 %endif diff --git a/media/media.gyp b/media/media.gyp index 1a90391..470f580 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1073,11 +1073,19 @@ }], [ 'OS=="win"', { 'variables': { - 'yasm_flags': [ - '-DWIN32', - '-DMSVC', - '-DCHROMIUM', - '-Isimd', + 'conditions': [ + [ 'target_arch=="ia32"', { + 'yasm_flags': [ + '-DCHROMIUM', + '-Isimd', + ], + }, { + 'yasm_flags': [ + '-DARCH_X86_64', + '-DCHROMIUM', + '-Isimd', + ], + }], ], }, }], diff --git a/third_party/yasm/yasm_compile.gypi b/third_party/yasm/yasm_compile.gypi index 31ce6cf..0d9263ffd 100644 --- a/third_party/yasm/yasm_compile.gypi +++ b/third_party/yasm/yasm_compile.gypi @@ -70,7 +70,7 @@ }], [ 'OS=="win" and target_arch=="x64"', { 'yasm_flags': [ - '-fx64', + '-fwin64', '-m', 'amd64', ], }], |