[dpdk-stable] patch 'build: fix meson binutils workaround' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1ea1fb6f7e978b39aa615f0d0d8d2ae1d227f6bd

Thanks.

Kevin Traynor

---
>From 1ea1fb6f7e978b39aa615f0d0d8d2ae1d227f6bd Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Thu, 2 May 2019 14:35:25 +0100
Subject: [PATCH] build: fix meson binutils workaround

[ upstream commit 6e625189f25ca56859715b07732491f829619ec1 ]

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")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 config/x86/meson.build | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/config/x86/meson.build b/config/x86/meson.build
index 9e5952aa3..c92ffec6f 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -2,12 +2,9 @@
 # Copyright(c) 2017 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
 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
@@ -18,5 +15,5 @@ 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,21 +35,21 @@ else
 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']
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 11:05:08.289223021 +0100
+++ 0050-build-fix-meson-binutils-workaround.patch	2019-05-08 11:05:05.860932113 +0100
@@ -1 +1 @@
-From 6e625189f25ca56859715b07732491f829619ec1 Mon Sep 17 00:00:00 2001
+From 1ea1fb6f7e978b39aa615f0d0d8d2ae1d227f6bd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6e625189f25ca56859715b07732491f829619ec1 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 2b2d06281..ca4d12506 100644
+index 9e5952aa3..c92ffec6f 100644
@@ -26,2 +27,2 @@
-@@ -2,7 +2,4 @@
- # Copyright(c) 2017-2019 Intel Corporation
+@@ -2,12 +2,9 @@
+ # Copyright(c) 2017 Intel Corporation
@@ -33,9 +34,8 @@
- if not is_windows
-@@ -10,5 +7,5 @@ if not is_windows
- 	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
-@@ -20,5 +17,5 @@ sse_errormsg = '''SSE4.2 instruction set is required for DPDK.
+ 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
+@@ -18,5 +15,5 @@ sse_errormsg = '''SSE4.2 instruction set is required for DPDK.
@@ -48 +48 @@
-@@ -39,21 +36,21 @@ else
+@@ -38,21 +35,21 @@ else