[dpdk-stable] patch 'build: use default flags for default Arm machine' 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/07/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 can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From b59c55cd80579d4546a4414f0c67f61bf9869903 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
Date: Wed, 20 Mar 2019 13:18:01 +0000
Subject: [PATCH] build: use default flags for default Arm machine

[ upstream commit 380154406dc8ce6f46a1c3e4e9fced5ba67644a1 ]

When building for generic distribution we need a stable baseline
architecture, or depending on the build worker the result will vary.

Force the default flags if the user explicitly sets machine=default
at configuration time.

Fixes: b1d48c41189a ("build: support ARM with meson")

Signed-off-by: Luca Boccassi <bluca at debian.org>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
---
 config/arm/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 45b611151..9feb54f22 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -7,4 +7,5 @@ march_opt = '-march=@0@'.format(machine)
 
 arm_force_native_march = false
+arm_force_default_march = (machine == 'default')
 
 machine_args_generic = [
@@ -106,5 +107,8 @@ else
 	cmd_output = cmd_generic # Set generic by default
 	machine_args = [] # Clear previous machine args
-	if not meson.is_cross_build()
+	if arm_force_default_march and not meson.is_cross_build()
+		machine = impl_generic
+		impl_pn = 'default'
+	elif not meson.is_cross_build()
 		# The script returns ['Implementer', 'Variant', 'Architecture',
 		# 'Primary Part number', 'Revision']
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.053218860 +0100
+++ 0026-build-use-default-flags-for-default-Arm-machine.patch	2019-04-30 17:58:13.802139882 +0100
@@ -1 +1 @@
-From 380154406dc8ce6f46a1c3e4e9fced5ba67644a1 Mon Sep 17 00:00:00 2001
+From b59c55cd80579d4546a4414f0c67f61bf9869903 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 380154406dc8ce6f46a1c3e4e9fced5ba67644a1 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 22a062bad..431f03e56 100644
+index 45b611151..9feb54f22 100644
@@ -31,2 +32,2 @@
- flags_common_default = [
-@@ -121,5 +122,8 @@ else
+ machine_args_generic = [
+@@ -106,5 +107,8 @@ else