max/x264
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86inc: Fix warnings with old nasm versions

Browse Source
This commit is contained in:
Henrik Gramner
2024-02-22 12:54:30 +01:00
committed by Henrik Gramner
parent de1bea534f
commit 3d8aff7e26
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/x86/x86inc.asm
+5 -5
View File
@@ -111,7 +111,7 @@
%endif
%define HAVE_PRIVATE_EXTERN 1
%ifdef __NASM_VER__
%ifdef __NASM_VERSION_ID__
%use smartalign
%if __NASM_VERSION_ID__ < 0x020e0000 ; 2.14
%define HAVE_PRIVATE_EXTERN 0
@@ -856,8 +856,8 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
; The GNU linker assumes the stack is executable by default.
[SECTION .note.GNU-stack noalloc noexec nowrite progbits]
%ifdef __NASM_VER__
%if __NASM_VER__ >= 0x020e0300 ; 2.14.03
%ifdef __NASM_VERSION_ID__
%if __NASM_VERSION_ID__ >= 0x020e0300 ; 2.14.03
%if ARCH_X86_64
; Control-flow Enforcement Technology (CET) properties.
[SECTION .note.gnu.property alloc noexec nowrite note align=gprsize]
@@ -964,13 +964,13 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae,
%endif
%if ARCH_X86_64 || cpuflag(sse2)
%ifdef __NASM_VER__
%ifdef __NASM_VERSION_ID__
ALIGNMODE p6
%else
CPU amdnop
%endif
%else
%ifdef __NASM_VER__
%ifdef __NASM_VERSION_ID__
ALIGNMODE nop
%else
CPU basicnop