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 7CB13A00E6 for ; Tue, 16 Apr 2019 17:39:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 253631B503; Tue, 16 Apr 2019 17:39:40 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id ECF261B4F7; Tue, 16 Apr 2019 17:39:37 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Apr 2019 08:39:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,358,1549958400"; d="scan'208";a="131897844" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.212]) by orsmga007.jf.intel.com with ESMTP; 16 Apr 2019 08:39:35 -0700 From: Ferruh Yigit To: Thomas Monjalon Cc: dev@dpdk.org, stable@dpdk.org, harry.van.haaren@intel.com Date: Tue, 16 Apr 2019 16:39:31 +0100 Message-Id: <20190416153932.21788-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190410140058.26782-1-ferruh.yigit@intel.com> References: <20190410140058.26782-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 1/2] build: fix meson binutils workaround 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" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190416153931.cYzFi16TT9gTi5AqNGPN45xreheTpSQhnwfBXM8aYEU@z> The '-mno-avx512f' compiler flag is not passed to the compiler, detection of the binutils and setting flags works fine, but the flag itself not used by compiler. Removing the interim 'march_opt' variable and using directly 'machine_args' and setting '-mno-avx512f' to 'machine_args' Fixes: 566b4d7a968f ("build: fix meson check for binutils 2.30") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit --- Cc: harry.van.haaren@intel.com --- config/x86/meson.build | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/config/x86/meson.build b/config/x86/meson.build index 558edfda9..692aebe7a 100644 --- a/config/x86/meson.build +++ b/config/x86/meson.build @@ -1,15 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -# for checking defines we need to use the correct compiler flags -march_opt = ['-march=@0@'.format(machine)] - # get binutils version for the workaround of Bug 97 if host_machine.system() != 'windows' ldver = run_command('ld', '-v').stdout().strip() if ldver.contains('2.30') if cc.has_argument('-mno-avx512f') - march_opt += '-mno-avx512f' + machine_args += '-mno-avx512f' message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97') endif endif @@ -19,7 +16,7 @@ endif sse_errormsg = '''SSE4.2 instruction set is required for DPDK. Please set the machine type to "nehalem" or "corei7" or higher value''' -if cc.get_define('__SSE4_2__', args: march_opt) == '' +if cc.get_define('__SSE4_2__', args: machine_args) == '' error(sse_errormsg) endif @@ -38,23 +35,23 @@ else dpdk_conf.set('RTE_ARCH', 'i686') endif -if cc.get_define('__AES__', args: march_opt) != '' +if cc.get_define('__AES__', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1) compile_time_cpuflags += ['RTE_CPUFLAG_AES'] endif -if cc.get_define('__PCLMUL__', args: march_opt) != '' +if cc.get_define('__PCLMUL__', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_PCLMULQDQ', 1) compile_time_cpuflags += ['RTE_CPUFLAG_PCLMULQDQ'] endif -if cc.get_define('__AVX__', args: march_opt) != '' +if cc.get_define('__AVX__', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX', 1) compile_time_cpuflags += ['RTE_CPUFLAG_AVX'] endif -if cc.get_define('__AVX2__', args: march_opt) != '' +if cc.get_define('__AVX2__', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX2', 1) compile_time_cpuflags += ['RTE_CPUFLAG_AVX2'] endif -if cc.get_define('__AVX512F__', args: march_opt) != '' +if cc.get_define('__AVX512F__', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX512F', 1) compile_time_cpuflags += ['RTE_CPUFLAG_AVX512F'] endif -- 2.20.1