diff options
| author | KO Myung-Hun <komh@chollian.net> | 2015-08-28 22:23:38 +0900 |
|---|---|---|
| committer | KO Myung-Hun <komh@chollian.net> | 2015-09-02 19:04:13 +0900 |
| commit | 6b56405f5e44b35c8d9c905a2697400d9c760eb5 (patch) | |
| tree | 8c4a0d96f88c81b9777f28c003a5282ecae7d64e /third_party | |
| parent | 6201a256f48c7fccbe2c1f7778ad75b0693ac6d9 (diff) | |
| download | libvpx-6b56405f5e44b35c8d9c905a2697400d9c760eb5.tar libvpx-6b56405f5e44b35c8d9c905a2697400d9c760eb5.tar.gz libvpx-6b56405f5e44b35c8d9c905a2697400d9c760eb5.tar.bz2 libvpx-6b56405f5e44b35c8d9c905a2697400d9c760eb5.zip | |
x86inc.asm: fix NASM compilation
Change-Id: I1e7f3c32969dac7911921062b396750302878c2e
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/x86inc/README.libvpx | 2 | ||||
| -rw-r--r-- | third_party/x86inc/x86inc.asm | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index fe5b07611..e91e305a2 100644 --- a/third_party/x86inc/README.libvpx +++ b/third_party/x86inc/README.libvpx @@ -20,3 +20,5 @@ Copy PIC 'GLOBAL' macros from x86_abi_support.asm Use .text instead of .rodata on macho to avoid broken tables in PIC mode. Use .text with no alignment for aout Only use 'hidden' visibility with Chromium +Move '%use smartalign' for nasm out of 'INIT_CPUFLAGS' and before + 'ALIGNMODE'. diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm index 77a58f295..be59de311 100644 --- a/third_party/x86inc/x86inc.asm +++ b/third_party/x86inc/x86inc.asm @@ -876,6 +876,10 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits %define cpuflag(x) ((cpuflags & (cpuflags_ %+ x)) == (cpuflags_ %+ x)) %define notcpuflag(x) ((cpuflags & (cpuflags_ %+ x)) != (cpuflags_ %+ x)) +%ifdef __NASM_VER__ + %use smartalign +%endif + ; Takes an arbitrary number of cpuflags from the above list. ; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu. ; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co. @@ -912,7 +916,6 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits %endif %ifdef __NASM_VER__ - %use smartalign ALIGNMODE k7 %elif ARCH_X86_64 || cpuflag(sse2) CPU amdnop |