cd6683331d
When compiling the ACL library on a system without AVX2 support,
the flags used to compile the AVX2-specific code for later run-time
use were not based on the regular cflags for the rest of the library.
This can cause errors due to symbols being missed/undefined
due to incorrect flags. For example,
when testing compilation on Alpine linux, we got:
error: unknown type name 'cpu_set_t'
due to _GNU_SOURCE not being defined in the cflags.
This issue can be fixed by appending "-mavx2" to
the cflags rather than replacing them with it.
Fixes: 5b9656b157d3 ("lib: build with meson")
Cc: stable@dpdk.org
Signed-off-by: Andrius Sirvys <andrius.sirvys@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
32 lines
1.0 KiB
Meson
32 lines
1.0 KiB
Meson
# SPDX-License-Identifier: BSD-3-Clause
|
|
# Copyright(c) 2017 Intel Corporation
|
|
|
|
version = 2
|
|
sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
|
|
'rte_acl.c', 'tb_mem.c')
|
|
headers = files('rte_acl.h', 'rte_acl_osdep.h')
|
|
|
|
if arch_subdir == 'x86'
|
|
sources += files('acl_run_sse.c')
|
|
|
|
# compile AVX2 version if either:
|
|
# a. we have AVX supported in minimum instruction set baseline
|
|
# b. it's not minimum instruction set, but supported by compiler
|
|
#
|
|
# in former case, just add avx2 C file to files list
|
|
# in latter case, compile c file to static lib, using correct compiler
|
|
# flags, and then have the .o file from static lib linked into main lib.
|
|
if dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2')
|
|
sources += files('acl_run_avx2.c')
|
|
cflags += '-DCC_AVX2_SUPPORT'
|
|
elif cc.has_argument('-mavx2')
|
|
avx2_tmplib = static_library('avx2_tmp',
|
|
'acl_run_avx2.c',
|
|
dependencies: static_rte_eal,
|
|
c_args: cflags + ['-mavx2'])
|
|
objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
|
|
cflags += '-DCC_AVX2_SUPPORT'
|
|
endif
|
|
|
|
endif
|