summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorFerruh Yigit <ferruh.yigit@intel.com>2019-05-02 14:35:25 +0100
committerThomas Monjalon <thomas@monjalon.net>2019-05-02 17:48:03 +0200
commit6e625189f25ca56859715b07732491f829619ec1 (patch)
treeefeba8f4fbebd93f0c2f1d3ed390c147535a2bd6 /config
parenta53f14f96112a0851a9c3788dd1e7b9d61c50191 (diff)
downloaddpdk-draft-windows-6e625189f25ca56859715b07732491f829619ec1.zip
dpdk-draft-windows-6e625189f25ca56859715b07732491f829619ec1.tar.gz
dpdk-draft-windows-6e625189f25ca56859715b07732491f829619ec1.tar.xz
build: fix meson binutils workaround
The '-mno-avx512f' compiler flag is not passed to the compiler, detection of the binutils and setting flags works fine, but the flag itself not used by compiler. Removing the interim 'march_opt' variable and using directly 'machine_args' and setting '-mno-avx512f' to 'machine_args' Fixes: 566b4d7a968f ("build: fix meson check for binutils 2.30") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'config')
-rw-r--r--config/x86/meson.build17
1 files changed, 7 insertions, 10 deletions
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 2b2d062..ca4d125 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -1,15 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
-# for checking defines we need to use the correct compiler flags
-march_opt = ['-march=@0@'.format(machine)]
-
# get binutils version for the workaround of Bug 97
if not is_windows
ldver = run_command('ld', '-v').stdout().strip()
if ldver.contains('2.30')
if cc.has_argument('-mno-avx512f')
- march_opt += '-mno-avx512f'
+ machine_args += '-mno-avx512f'
message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
endif
endif
@@ -19,7 +16,7 @@ endif
sse_errormsg = '''SSE4.2 instruction set is required for DPDK.
Please set the machine type to "nehalem" or "corei7" or higher value'''
-if cc.get_define('__SSE4_2__', args: march_opt) == ''
+if cc.get_define('__SSE4_2__', args: machine_args) == ''
error(sse_errormsg)
endif
@@ -38,23 +35,23 @@ else
dpdk_conf.set('RTE_ARCH', 'i686')
endif
-if cc.get_define('__AES__', args: march_opt) != ''
+if cc.get_define('__AES__', args: machine_args) != ''
dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1)
compile_time_cpuflags += ['RTE_CPUFLAG_AES']
endif
-if cc.get_define('__PCLMUL__', args: march_opt) != ''
+if cc.get_define('__PCLMUL__', args: machine_args) != ''
dpdk_conf.set('RTE_MACHINE_CPUFLAG_PCLMULQDQ', 1)
compile_time_cpuflags += ['RTE_CPUFLAG_PCLMULQDQ']
endif
-if cc.get_define('__AVX__', args: march_opt) != ''
+if cc.get_define('__AVX__', args: machine_args) != ''
dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX', 1)
compile_time_cpuflags += ['RTE_CPUFLAG_AVX']
endif
-if cc.get_define('__AVX2__', args: march_opt) != ''
+if cc.get_define('__AVX2__', args: machine_args) != ''
dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX2', 1)
compile_time_cpuflags += ['RTE_CPUFLAG_AVX2']
endif
-if cc.get_define('__AVX512F__', args: march_opt) != ''
+if cc.get_define('__AVX512F__', args: machine_args) != ''
dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX512F', 1)
compile_time_cpuflags += ['RTE_CPUFLAG_AVX512F']
endif