From mboxrd@z Thu Jan 1 00:00:00 1970 From: luca.boccassi@gmail.com Subject: [PATCH v4] build: use generic march on arm64 when using 'default' machine Date: Wed, 20 Mar 2019 13:18:01 +0000 Message-ID: <20190320131801.28289-1-luca.boccassi@gmail.com> References: <20181224125627.25690-1-bluca@debian.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit To: dev@dpdk.org Return-path: Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 4697610A3 for ; Wed, 20 Mar 2019 14:18:11 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id h18so11679974wml.1 for ; Wed, 20 Mar 2019 06:18:11 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:b00c:66c8:99df:336]) by smtp.gmail.com with ESMTPSA id l3sm1532182wmh.3.2019.03.20.06.18.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2019 06:18:07 -0700 (PDT) In-Reply-To: <20181224125627.25690-1-bluca@debian.org> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Luca Boccassi 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. v4: add acked-by, remove redundant assignment 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 8e892fa77..dddec4e04 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']], @@ -106,7 +107,10 @@ 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 + 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( -- 2.20.1