From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 44027A0679 for ; Tue, 30 Apr 2019 19:02:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 389C75A4A; Tue, 30 Apr 2019 19:02:29 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 6EED85F14 for ; Tue, 30 Apr 2019 19:02:27 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1BC481E17; Tue, 30 Apr 2019 17:02:26 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A04F17CF9; Tue, 30 Apr 2019 17:02:25 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: Bruce Richardson , Pavan Nikhilesh , dpdk stable Date: Tue, 30 Apr 2019 18:01:21 +0100 Message-Id: <20190430170133.2331-26-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 30 Apr 2019 17:02:26 +0000 (UTC) Subject: [dpdk-stable] patch 'build: use default flags for default Arm machine' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Bruce Richardson Acked-by: Pavan Nikhilesh --- 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@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