Skip to content

build: Fix AVX2 flags being unconditionally enabled when the compiler isn't building for AVX2 #3881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amyspark wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −6
Open

build: Fix AVX2 flags being unconditionally enabled when the compiler isn't building for AVX2 #3881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,13 @@ if ['linux', 'freebsd', 'android', 'ios', 'darwin'].contains(system)
endif
if cpu_family == 'x86'
asm_format = asm_format32
asm_args += ['-DX86_32', '-DX86_32_PICASM', '-DHAVE_AVX2']
add_project_arguments('-DHAVE_AVX2', language: 'cpp')
add_project_arguments('-DHAVE_AVX2', '-DX86_ASM', '-DX86_32_ASM', language: 'c')
asm_args += ['-DX86_32', '-DX86_32_PICASM']
add_project_arguments('-DX86_ASM', '-DX86_32_ASM', language: 'c')
asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'x86', '')
elif cpu_family == 'x86_64'
asm_format = asm_format64
asm_args += ['-DUNIX64', '-DHAVE_AVX2']
add_project_arguments('-DHAVE_AVX2', language: 'cpp')
add_project_arguments('-DHAVE_AVX2', '-DX86_ASM', language: 'c')
asm_args += ['-DUNIX64']
add_project_arguments('-DX86_ASM', language: 'c')
asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'x86', '')
elif cpu_family == 'arm'
asm_format = asm_format32
Expand Down Expand Up @@ -143,6 +141,14 @@ else
error('FIXME: Unhandled system @0@'.format(system))
endif

if cpu_family in ['x86', 'x86_64']
if cc.get_define('_M_IX86_FP') == '2' or cc.has_define('__AVX2__')
asm_args += ['-DHAVE_AVX2']
add_project_arguments('-DHAVE_AVX2', language: 'cpp')
add_project_arguments('-DHAVE_AVX2', language: 'c')
endif
endif

use_asm_gen = false
if cpu_family in ['x86', 'x86_64']
nasm = find_program('nasm')
Expand Down