diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/arm/meson.build | 3 | ||||
| -rw-r--r-- | config/x86/meson.build | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/config/arm/meson.build b/config/arm/meson.build index 3f917250..dae55d6b 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -47,6 +47,7 @@ flags_common_default = [ flags_generic = [ ['RTE_MACHINE', '"armv8a"'], ['RTE_MAX_LCORE', 256], + ['RTE_USE_C11_MEM_MODEL', true], ['RTE_CACHE_LINE_SIZE', 128]] flags_cavium = [ ['RTE_MACHINE', '"thunderx"'], @@ -57,11 +58,13 @@ flags_cavium = [ ['RTE_USE_C11_MEM_MODEL', false]] flags_dpaa = [ ['RTE_MACHINE', '"dpaa"'], + ['RTE_USE_C11_MEM_MODEL', true], ['RTE_CACHE_LINE_SIZE', 64], ['RTE_MAX_NUMA_NODES', 1], ['RTE_MAX_LCORE', 16]] flags_dpaa2 = [ ['RTE_MACHINE', '"dpaa2"'], + ['RTE_USE_C11_MEM_MODEL', true], ['RTE_CACHE_LINE_SIZE', 64], ['RTE_MAX_NUMA_NODES', 1], ['RTE_MAX_LCORE', 16], diff --git a/config/x86/meson.build b/config/x86/meson.build index 33efb5e5..9e5952aa 100644 --- a/config/x86/meson.build +++ b/config/x86/meson.build @@ -2,7 +2,16 @@ # Copyright(c) 2017 Intel Corporation # for checking defines we need to use the correct compiler flags -march_opt = '-march=@0@'.format(machine) +march_opt = ['-march=@0@'.format(machine)] + +# get binutils version for the workaround of Bug 97 +ldver = run_command('ld', '-v').stdout().strip() +if ldver.contains('2.30') + if cc.has_argument('-mno-avx512f') + march_opt += '-mno-avx512f' + message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97') + endif +endif # we require SSE4.2 for DPDK sse_errormsg = '''SSE4.2 instruction set is required for DPDK. |