From patchwork Mon Dec 24 12:56:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 49259 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6E1FF1B4D0; Mon, 24 Dec 2018 13:56:32 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 70CC21B499; Mon, 24 Dec 2018 13:56:31 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id u4so11484900wrp.3; Mon, 24 Dec 2018 04:56:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ha1GnU1Vvp+B1iUn84+Zqndze9LtumZuMhdeMx91zqY=; b=UG5uJW87G66NfHploKt/9Abfy1oayGmxQ5vLpKIT2ywI1caWm3qf+cgbtVzSzlNFsQ 00ceX8AETjfoQirnfX9dX3oPqTTKEM5P4iLu9i7rdwM8oRK5cqBgMjKJpcPMcjx520Tc CqjTBisoYcLLvH+8PZqpEdb3i7+uuC4zCkxUctiw5/dsqEo71oGs3d3giJmfrf01X7TW gVn3XxxJYF3xV5v544LYTtzdvbcIBqnQfqAmGQLQC90UR2ToONREKUeGEqWmMw0uh3iL vXuUS9TbPVkEGxNpYqOMvoVMCffMENWJR+Q0sIPt5zekHnLQe+NiBAiD38RtXoXqKses 101w== X-Gm-Message-State: AJcUukebLd5KxzTYVzf0TpqALC2qq4DngcBUnHrthys9gG6UlHxhQX+i FLtI2ak6++UCbQqUIbH4cH0iITnTkwk= X-Google-Smtp-Source: ALg8bN4g03l7roElqXAoJG2rlSJZjvR6t2V/q+PtpcTV502iPuXxxM0ujegjIAl+MqSeQKG7qse56g== X-Received: by 2002:a05:6000:104b:: with SMTP id c11mr12115979wrx.303.1545656190667; Mon, 24 Dec 2018 04:56:30 -0800 (PST) Received: from localhost ([80.120.231.178]) by smtp.gmail.com with ESMTPSA id k135sm32686773wmd.42.2018.12.24.04.56.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Dec 2018 04:56:29 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, christian.ehrhardt@canonical.com, Luca Boccassi , stable@dpdk.org Date: Mon, 24 Dec 2018 13:56:27 +0100 Message-Id: <20181224125627.25690-1-bluca@debian.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] build: use generic march on arm64 when using 'default' machine X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 marchine=default at configuration time. Fixes: b1d48c41189a ("build: support ARM with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- config/arm/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index dae55d6b2..fa21a2fd2 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -6,6 +6,7 @@ march_opt = '-march=@0@'.format(machine) arm_force_native_march = false +arm_force_default_march = machine == 'default' machine_args_generic = [ ['default', ['-march=armv8-a+crc+crypto']], @@ -105,7 +106,11 @@ else cmd_generic = ['generic', '', '', 'default', ''] 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 + cmd_output = cmd_generic + impl_pn = 'default' + elif not meson.is_cross_build() # The script returns ['Implementer', 'Variant', 'Architecture', # 'Primary Part number', 'Revision'] detect_vendor = find_program(join_paths(