[dpdk-stable] patch 'build: explicitly enable sse4 for meson' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. 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.

Thanks.

Luca Boccassi

---
>From 6bcb93c8232d3ddc2547018acd18e94e93acb85c Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Mon, 23 Dec 2019 10:38:40 +0000
Subject: [PATCH] build: explicitly enable sse4 for meson

[ upstream commit 10060dba6455461088d24e03d3cfeba639d53022 ]

If the compiler does not recognise the specific CPU when building with the
default "native" machine type, sse4.2 instructions can be missing, causing
a build error. Rather than advising the user to change the machine type,
we can just turn on SSE4.2 directly. This can prevent issues with running
automated tests with older compilers/distros on newer hardware.

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 config/x86/meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/x86/meson.build b/config/x86/meson.build
index 8b0fa3e6f1..adc857ba28 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -15,11 +15,9 @@ if not is_windows
 endif
 
 # we require SSE4.2 for DPDK
-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: machine_args) == ''
-	error(sse_errormsg)
+	message('SSE 4.2 not enabled by default, explicitly enabling')
+	machine_args += '-msse4'
 endif
 
 base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2']
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:39.246524312 +0000
+++ 0008-build-explicitly-enable-sse4-for-meson.patch	2020-02-11 11:17:38.307999627 +0000
@@ -1,16 +1,16 @@
-From 10060dba6455461088d24e03d3cfeba639d53022 Mon Sep 17 00:00:00 2001
+From 6bcb93c8232d3ddc2547018acd18e94e93acb85c Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Mon, 23 Dec 2019 10:38:40 +0000
 Subject: [PATCH] build: explicitly enable sse4 for meson
 
+[ upstream commit 10060dba6455461088d24e03d3cfeba639d53022 ]
+
 If the compiler does not recognise the specific CPU when building with the
 default "native" machine type, sse4.2 instructions can be missing, causing
 a build error. Rather than advising the user to change the machine type,
 we can just turn on SSE4.2 directly. This can prevent issues with running
 automated tests with older compilers/distros on newer hardware.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: David Marchand <david.marchand at redhat.com>
 ---