ref: 6b56405f5e44b35c8d9c905a2697400d9c760eb5
parent: 6201a256f48c7fccbe2c1f7778ad75b0693ac6d9
author: KO Myung-Hun <[email protected]>
date: Fri Aug 28 18:23:38 EDT 2015
x86inc.asm: fix NASM compilation Change-Id: I1e7f3c32969dac7911921062b396750302878c2e
--- a/third_party/x86inc/README.libvpx
+++ b/third_party/x86inc/README.libvpx
@@ -20,3 +20,5 @@
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'.
--- a/third_party/x86inc/x86inc.asm
+++ b/third_party/x86inc/x86inc.asm
@@ -876,6 +876,10 @@
%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 @@
%endif
%ifdef __NASM_VER__
- %use smartalign
ALIGNMODE k7
%elif ARCH_X86_64 || cpuflag(sse2)
CPU amdnop