From patchwork Mon Jan 7 14:11:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 49477 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 EBFBB1B3E8; Mon, 7 Jan 2019 15:11:33 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id CFB881B227; Mon, 7 Jan 2019 15:11:32 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id t6so516927wrr.12; Mon, 07 Jan 2019 06:11:32 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=zUom+taxKCgJRh+hTG31gv3QyeEf+mRzbtCnllOyvt0=; b=f8AaRyOTTBg1lLED8EKCR4leXSizFzESQpd6CaXNH0vvb2mxrbz7fvdubasTb5RTSL D8S3PO6BTE0ndiU9my/+39M2xxqI/JHFeMu2qNwvT2t5Y9QpB3YeW7P3z6wmMPjH7P5z Yez8QqaAm6keopFAVu3AIT+/S4p/LEl2BVfG8GpReo8rQ2O0TkcqFuAzIh9NQBD8+EfW FeYDebq181l8/vMBHz0b7F9fbLR39mVTECBBtPQpy+DtZoy0zpYyAsCoZXsvuP8OHMeP qSjVCAdoZ97ieYvNxnXt93CvO7ACl7epqjtMrKCuF6PwD0ypxMaH23oGjHC7syzfqbIT 16Zw== X-Gm-Message-State: AJcUukfjoevZiro0Pp5rf6m6JnRZSHzsDl0SthBZXTn/1FDyHbxuDhr/ GbL4Gw4CSSRheyY4ryXRaLpgOgJ56Nw= X-Google-Smtp-Source: ALg8bN5Nb1giKE1DGqukEvInSXBsxAUTpsn2dvz6gCBLdX063Cwg30sIlboUjVn2Eh15r4hu6BY1Zg== X-Received: by 2002:a5d:488f:: with SMTP id g15mr51792699wrq.15.1546870292119; Mon, 07 Jan 2019 06:11:32 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id n15sm44509460wrt.21.2019.01.07.06.11.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Jan 2019 06:11:31 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, gavin.hu@arm.com, viktorin@rehivetech.com, jerinj@marvell.com, Luca Boccassi , stable@dpdk.org Date: Mon, 7 Jan 2019 14:11:30 +0000 Message-Id: <20190107141130.24360-1-bluca@debian.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181224125627.25690-1-bluca@debian.org> References: <20181224125627.25690-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3] 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 machine=default at configuration time. Fixes: b1d48c41189a ("build: support ARM with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson Acked-by: Pavan Nikhilesh --- v2: fix typo in commit message, remove variable used only once v3: put back temporary variable, as "machine" gets overwritten by the function and loses the original value before we need it. 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..614139534 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(