From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0059.outbound.protection.outlook.com [104.47.37.59]) by dpdk.org (Postfix) with ESMTP id 525A91B381 for ; Fri, 19 Jan 2018 14:53:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sKYu9a/Fjx3jMXa+vQuLQDpTS+ZEV7Dr5hhl4V9+ujQ=; b=ESmq6E7upEtZFd+xMnF/gFZHcuyHXflmo67dxQddxItTNkyff0K+LVdHdrM+8I3TiOTtlk0nto0kNsFZodDrZgODmtRmRLJMfW9XjHEoBXA0Z+SZbz8H/vvs03YfJ8sXy57n8Q9fPDshM3JumYT5YLPn9MKj/cYiSYqSYc3qdk0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from Pavan-LT.caveonetworks.com (111.93.218.67) by MWHPR07MB3472.namprd07.prod.outlook.com (10.164.192.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 13:53:45 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, harry.van.haaren@intel.com, herbert.guan@arm.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Fri, 19 Jan 2018 19:22:51 +0530 Message-Id: <20180119135251.10171-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180119135251.10171-1-pbhagavatula@caviumnetworks.com> References: <20171219105338.198727-1-bruce.richardson@intel.com> <20180119135251.10171-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: CY4PR19CA0044.namprd19.prod.outlook.com (10.172.173.158) To MWHPR07MB3472.namprd07.prod.outlook.com (10.164.192.23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33376357-4bbf-4b26-ab11-08d55f441044 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:MWHPR07MB3472; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3472; 3:xPTX2r7Hgc6KVo+nqFm09o8sPdAptgjpSS04wrt7XEmLuNRqJvQ8xdOEBbF1Y2hG4pQ6Q6GBeX8FCApTxaRKuf2SN6auwH7uvfF9lySdqnjTmIQRmBlbW3Q3MF0ZFF9ScBDTE3GdKUFJesFM3ckq4zzaadJxSCxPHzUyBchg4qKUVLQIhofTkud+3BbRbjJBsl0w3KqJg4bKEw1KNYftqD+IZHxN476I2WfliLE9wYuODkT7cjyekun55QJaBv8W; 25:AMTvPsP+ov2vpqoBrFKqN48ZLzDkXZqWAiXY2kAs8BzRo7fLHzphvXTpu3C49CHqbBYu4jpNqMZVrLmb598yGmrDiL119skGGiMRWmQmtFDF2mhsteUXjY6pnq7pkj8G5K0rJfRIkYKFSoJS2EH9FXnbIMMi6b7gtX9mchhjpaQn7Nbu5GN5TusR8Tujwou23VAG5vurB+6UjgQpzPqpdlcYKNMwKdUrYNnxD1wX0Oy+l0yuaxz/M2ksTuL+JMCtR+L786jI1/IKS7SQoB0wvASMhuoy0DBLETlnpRSN1Qej2YPTeq5UW/Nc6yB70m+pCqt26hsFjGCqylGl/oPx9A==; 31:9F1jjeKdtlNxHXstUUZg6prswNn2MPZ2/oYZ1o5QXR7nGxGXJoghbFYSk70u+b+EeY2oMANWD69z7pb49Id9Jqc5Wo2d7U9R/PykGNk6Aqv4YlwNZuES5qzllEFDgg3bucz772i8pZddri/64JAuEe89dlbZlMvGnwS2cX6Nk/1l4crCc5GINujgSlHdYu/75WCDI9hRlq1KEvQCThvtKycrbxSV8s5IXlXhEPbng7I= X-MS-TrafficTypeDiagnostic: MWHPR07MB3472: X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3472; 20:0ek0EpWSUqyERaTefpH5W3Hdqn1ek3ksO52QgBB7XgMOXyqk5BMqwpnFGW36IgpKfGMiX3TBQLav/4mFGCGGvgynZRUT2iECqhsR71DTz4QmUYWwBQ2Jv4xLTr0uU1x+Rh4IVt0WiRTp78hMW+wSmtQmsDOxvnzlto+Gxo8/1HKHAMc4i7wIaAqmdHnZwT765n6Kpc/nU7lAjcM7DLGj2pnjmK8xUFoL+THGllTQn97w7AhVJOXBZArOHH0As2kCs4CbN9gnfhMq7Mib+EzHH1tW+2mPXTh1LuP9RnsK0YScD5o4rNEWYRcwP5ZWTl7DJAvaCO1yLTFZqiC+y+NQ7n7P6peu0rX/McXzLMKtsLlai3NmJi2SVtjL1xq7PDz+brOGfUMQBp6d6orSgdmwm5unelB+Fc3OpBVzLp6vlGm0xVFE5q1XOP3pfZPiwGL2i5yCdDTk1buDU512zEQVilmCEg/UFF8teOvzOeTnrMMSZUYP3qKaUgNwfdxQHK8KLKfktzsM9lF9m+zraxeHKcQu64IAZ4l9hISdnEby3+W7zUWzJiUMBEi9Im/hRNJY9mJaI4+dcsQF/zBEuSo0Es+8o3I5Y5+L8R+ImgO0MfQ=; 4:A/PvcAVBW3GP+KEuPypUxDk9EnovZ3SWnxWzwdF2865K0eRwsfaO4fgMofhOih6TZEeW2ZUjB8IGlQplBSTSqot7kPR/nj6FynY2r7u3MERJsw1u63lQ6UlZVReWD+yAEHBbp40w/vWGm5RTvLnnvt+fNEH8PgeI1wVVMRVmLO2PT8wQbhosZWya8PvXo3klK/ZmUTjpfHcjGUL2N8WHx8Auz1NKtO6T9xASpQkaPVmmKbM4zPG51QuTiBlrTme+yuFtR2NL02iR6HM/0bFejA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3002001)(93006095)(10201501046)(3231023)(2400078)(944501161)(6041268)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:MWHPR07MB3472; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:MWHPR07MB3472; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(346002)(39380400002)(39860400002)(189003)(199004)(4326008)(6512007)(7736002)(48376002)(50466002)(52116002)(51416003)(59450400001)(69596002)(386003)(6506007)(36756003)(97736004)(1076002)(575784001)(2906002)(47776003)(26005)(66066001)(3846002)(6116002)(5660300001)(8936002)(68736007)(81166006)(105586002)(53416004)(25786009)(305945005)(316002)(16586007)(53936002)(107886003)(5009440100003)(478600001)(76176011)(72206003)(8676002)(6666003)(50226002)(42882006)(6486002)(16526018)(2950100002)(106356001)(81156014)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3472; H:Pavan-LT.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR07MB3472; 23:k4Q7NfceR1xTfM+xt/3VdZw6E7uag6GuNYGwKhoXw?= =?us-ascii?Q?4ILZfKEJdlWmDjp1EEiIILjswpIAwjgrisj9oI51QioCAjIq2TESHQWL9CIM?= =?us-ascii?Q?GbWNxq/LPim7PZ+0KH3eWK0tyNPW53TuqkASQnQYWAMX5sn3YiIt1HpSO/r/?= =?us-ascii?Q?wpb/rhOEAjqWmxFNc6/etEhC9i97XQnrpyL1/wO1/3rUE2L8iHkF97QxpCMW?= =?us-ascii?Q?j9fhHxMHNN0cxGr2GXnRWfulhj+Z8CvowjWIs9czKS28dQ/UmiALKrEfn+XQ?= =?us-ascii?Q?+H9aoWAluVKTpNd6XZ5FLU7M8VtlLUArZxBy4G4Ril8DotbARlaAGI0gf0it?= =?us-ascii?Q?aKqB7++bA2WRpgBrSJmqL0mHpqc1YAWe3PS3IPWvs4v+r82grOc9SWJJf5ep?= =?us-ascii?Q?aRGH0C5M9p5ptW6mo0OWbKv1LXRVgLHlkBtaWu6EQ5gCVmduvRdb2vOp29sv?= =?us-ascii?Q?Oe/FWIKsdVNfWiF2Ct1mzanBFBNe+gNRyyd+gSutNhd/SlT02ecz5TdtB0Z1?= =?us-ascii?Q?YqFEnsrIaLxzaZZdzR9cWm9jPwoYVXceOJZAYwaEQrwmA08pIxb31Npkl8Vd?= =?us-ascii?Q?bIiQXp1RIh2eaosi4VNAsBTrOSwOiTZ3eiwgF/4sQO+e9U4NKDpQ5eRXrlOn?= =?us-ascii?Q?GoWIwxD5N6W/z7ppG8V6CZILOIVUAi+3Zf2fB1eymxpwnuiKEtEuYj6CAeRP?= =?us-ascii?Q?zCqYW0PqFkA8x4yKpOHAfcjLVn41uVaHT+q2SMNhvlSmbVKwSs2OlY7MoYMc?= =?us-ascii?Q?Ic2KJU9QeGqqDvUrF1DINSlKkhu0GOP0rKyyG1DQBcZQs34AdtY/fV/OZT6B?= =?us-ascii?Q?4Iy5jkDVcS5YA1KIIXZ6HfRnxKpu3Mg5X5tf4n9HajK5sgDpDiGjdtJS9g+3?= =?us-ascii?Q?Q17cYuIiHWn7H8eJZw1Qnl+Os8UPo5CkHT9diNXHmFYLZqdT9tDBIKv2DILr?= =?us-ascii?Q?0wRisC1WOzhGmLDO1CsCT5F5/Lc/fBE64raEA8QXDfEJIzbNSlj085UH6Obz?= =?us-ascii?Q?Ysq1qsk+A6fMTPk2vkrQ3lfSKSaUFlpBvveuYvCu941hlJX/67U5aGTfR1Hb?= =?us-ascii?Q?JQ/DQI/lTFHLPaIFJfC9s4rYYY0ZkEDsami7N/oJVLFBAra+9plKgQuriOgt?= =?us-ascii?Q?ZTW+f8Q4eO1PZlrcoc23/DkMfNtyp8zja8Gjp2BJGMcnPAKRJR7bN8VFWL/L?= =?us-ascii?Q?bimyyVYMRTpYoP++JA3XiSO89FzDdEwjyzeENkqOAIwheYTcUM9VOZQgDW4e?= =?us-ascii?Q?w5mLD7m/5hW9WcQJ6OSTlb+Uf68iVnINhfcz/WI?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3472; 6:fDNXCEmdDEKwX+UjB1nsOP9LEYaEXCZBGTO7Ig94FU0EN0/WkziiOOCjloGxwS53eBOqlLnAoXTW/Ec4Xh83zU0nc1tKg0sGhwt1Z/mc9mC1raGaXwjqjEPC7/uN0J6arOJbJ0MNx92BBfdAsaCPu9WX8n4KA+CypMsJctFSRxPDBM43Mq73y1WmOrFovbJA1dD1E+n7L3RgQmI4l/TxkY6ujiPYMYelo/LoI0c6DhDrSyglYw7VCWl2HQAViSSqS9r13oMHOKLInYfawrgs63Qu6/F6tskbrUMBXbrGOv9YbR91K7f84kuW4z91h61EwPtgfNwcoRA6vvtJag19vYn0vnwL8FamqdC+iiuUhpw=; 5:2leHJk4nTg9HSGI4AVFodU37OhV9Tbieb7yJEEVM6jNlkJgcjfkR9ClKykPijEm/nKKrJyrgsTYy1Wk67bTkdGAZoj4yZB6elbYmj8lqOAZjfQ25/2ltibMJ9aeU8EkX7vMxbfDEnnu/jGfwbPBhcxUij9N2uORWNL0Xva/82/o=; 24:vYm7xUHYJbeExhGNqD0d9AL8YO0ACBcInIYpGSD2MLk2oZJitAVS698zjZp9pDSFmqpCDbTYPgG467SD3/ax6aQzHPHtpqKQ4wfy9vPgAQM=; 7:FH7N3txurqtYc+xyLD/8uaubCN64qZHha6VAitWz1AuDr+54lpYm4HxDqzR6Ty/swUrEbUg38gCg8fJtYAuAPaFj7Mrtzi7Bzmg60Yq20OmMySOAMenx+kCHm215xl7jSiSAO47N1m5lmbukbHuz8Q4AyBR8Mdy5vaGxQstdXZwOiijBsKC8yzCn286IlsX77rXMe1/N+i8uwdc7qylUh6JWFLeJlH+xpP5jB8v5O8nnKHgsghQ82ByXJqpciKdS SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 13:53:45.7674 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33376357-4bbf-4b26-ab11-08d55f441044 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3472 Subject: [dpdk-dev] [PATCH v3 2/2] build: add support for detecting march on ARM 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: , X-List-Received-Date: Fri, 19 Jan 2018 13:53:49 -0000 Added support for detecting march and mcpu by reading midr_el1 register. The implementer, primary part number values read can be used to figure out the underlying arm cpu. Signed-off-by: Pavan Nikhilesh --- app/test-pmd/meson.build | 2 +- config/arm/armv8_machine.py | 18 +++++++++++ config/arm/meson.build | 76 ++++++++++++++++++++++++++++++++++++++++----- config/meson.build | 19 ++++++------ drivers/meson.build | 2 +- examples/meson.build | 2 +- lib/meson.build | 2 +- meson.build | 2 +- test/test/meson.build | 2 +- 9 files changed, 102 insertions(+), 23 deletions(-) create mode 100755 config/arm/armv8_machine.py diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index e819677a5..2a3f0ba1f 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -45,7 +45,7 @@ endif executable('dpdk-testpmd', sources, - c_args: machine_arg, + c_args: machine_args, link_whole: link_libs, dependencies: dep_objs, install_rpath: join_paths(get_option('prefix'), driver_install_path), diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py new file mode 100755 index 000000000..404866d2f --- /dev/null +++ b/config/arm/armv8_machine.py @@ -0,0 +1,18 @@ +#!/usr/bin/python +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc + +ident = [] +fname = '/sys/devices/system/cpu/cpu0/regs/identification/midr_el1' +with open(fname) as f: + content = f.read() + +midr_el1 = (int(content.rstrip('\n'), 16)) + +ident.append(hex((midr_el1 >> 24) & 0xFF)) # Implementer +ident.append(hex((midr_el1 >> 20) & 0xF)) # Variant +ident.append(hex((midr_el1 >> 16) & 0XF)) # Architecture +ident.append(hex((midr_el1 >> 4) & 0xFFF)) # Primary Part number +ident.append(hex(midr_el1 & 0xF)) # Revision + +print(' '.join(ident)) diff --git a/config/arm/meson.build b/config/arm/meson.build index f05de4c2c..62af5e68a 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -5,28 +5,88 @@ # for checking defines we need to use the correct compiler flags march_opt = '-march=@0@'.format(machine) +machine_args_cavium = [ + ['default', ['-march=armv8-a+crc+crypto','-mcpu=thunderx']], + ['0xa1', ['-mcpu=thunderxt88']], + ['0xa2', ['-mcpu=thunderxt81']], + ['0xa3', ['-mcpu=thunderxt83']]] + +flags_cavium = [ + ['RTE_MACHINE', '"thunderx"'], + ['RTE_CACHE_LINE_SIZE', 128], + ['RTE_MAX_NUMA_NODES', 2], + ['RTE_MAX_LCORE', 96], + ['RTE_MAX_VFIO_GROUPS', 128], + ['RTE_RING_USE_C11_MEM_MODEL', false]] + +impl_0x43 = ['Cavium', flags_cavium, machine_args_cavium] + +dpdk_conf.set('RTE_TOOLCHAIN', '"gcc"') +dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1) dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) -if cc.sizeof('void *') == 8 - dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128) - dpdk_conf.set('RTE_ARCH_ARM64', 1) - dpdk_conf.set('RTE_ARCH_64', 1) -else + +if cc.sizeof('void *') != 8 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64) dpdk_conf.set('RTE_ARCH_ARM', 1) dpdk_conf.set('RTE_ARCH_ARMv7', 1) +else + dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128) + dpdk_conf.set('RTE_ARCH_ARM64', 1) + dpdk_conf.set('RTE_ARCH_64', 1) + + if not meson.is_cross_build() + # The script returns ['Implementor', 'Variant', 'Architecture', + # 'Primary Part number', 'Revision'] + detect_vendor = find_program(join_paths( + meson.current_source_dir(), 'armv8_machine.py')) + cmd = run_command(detect_vendor.path()) + if cmd.returncode() != 0 + message('Using default armv8 config') + else + machine_args = [] # Clear previous machine args + cmd_output = cmd.stdout().strip().split(' ') + machine = get_variable('impl_' + cmd_output[0]) + message('Implementor : ' + machine[0]) + + foreach flag: machine[1] + dpdk_conf.set(flag[0], flag[1]) + endforeach + + # Primary part number based mcpu flags are supported + # for gcc versions > 7 + if cc.version().version_compare('<7.0') + foreach marg: machine[2] + if marg[0] == 'default' + foreach f: marg[1] + machine_args += f + endforeach + endif + endforeach + else + foreach marg: machine[2] + if marg[0] == cmd_output[3] + foreach f: marg[1] + machine_args += f + endforeach + endif + endforeach + endif + endif + endif endif +message(machine_args) -if cc.get_define('__ARM_NEON', args: march_opt) != '' +if cc.get_define('__ARM_NEON', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_NEON', 1) compile_time_cpuflags += ['RTE_CPUFLAG_NEON'] endif -if cc.get_define('__ARM_FEATURE_CRC32', args: march_opt) != '' +if cc.get_define('__ARM_FEATURE_CRC32', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_CRC32', 1) compile_time_cpuflags += ['RTE_CPUFLAG_CRC32'] endif -if cc.get_define('__ARM_FEATURE_CRYPTO', args: march_opt) != '' +if cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != '' dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1) dpdk_conf.set('RTE_MACHINE_CPUFLAG_PMULL', 1) dpdk_conf.set('RTE_MACHINE_CPUFLAG_SHA1', 1) diff --git a/config/meson.build b/config/meson.build index fa55c53a5..f8c67578d 100644 --- a/config/meson.build +++ b/config/meson.build @@ -8,7 +8,8 @@ else machine = get_option('machine') endif dpdk_conf.set('RTE_MACHINE', machine) -machine_arg = '-march=' + machine +machine_args = [] +machine_args += '-march=' + machine # use pthreads add_project_link_arguments('-pthread', language: 'c') @@ -53,6 +54,14 @@ foreach arg: warning_flags endif endforeach +# set other values pulled from the build options +dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores')) +dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) +dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) +dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id')) +# values which have defaults which may be overridden +dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) + compile_time_cpuflags = [] if host_machine.cpu_family().startswith('x86') arch_subdir = 'x86' @@ -65,12 +74,4 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) # set the install path for the drivers dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) -# set other values pulled from the build options -dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores')) -dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) -dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) -dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id')) -# values which have defaults which may be overridden -dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) - install_headers('rte_config.h', subdir: get_option('include_subdir_arch')) diff --git a/drivers/meson.build b/drivers/meson.build index 9b5039847..1d6430bfe 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -22,7 +22,7 @@ foreach class:driver_classes version = 1 sources = [] objs = [] - cflags = [machine_arg] + cflags = machine_args includes = [include_directories(drv_path)] # set up internal deps. Drivers can append/override as necessary deps = std_deps diff --git a/examples/meson.build b/examples/meson.build index 0abed7169..b3f997242 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -9,7 +9,7 @@ endif foreach example: get_option('examples').split(',') name = example sources = [] - cflags = [machine_arg] + cflags = machine_args ext_deps = [] includes = [include_directories(example)] deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline'] diff --git a/lib/meson.build b/lib/meson.build index 0c94d74b9..b9ea6f61b 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -31,7 +31,7 @@ foreach l:libraries sources = [] headers = [] includes = [] - cflags = [machine_arg] + cflags = machine_args objs = [] # other object files to link against, used e.g. for # instruction-set optimized versions of code diff --git a/meson.build b/meson.build index 3dce8579e..326fbc7d1 100644 --- a/meson.build +++ b/meson.build @@ -66,5 +66,5 @@ pkg.generate(name: meson.project_name(), ['-Wl,-Bdynamic'] + dpdk_extra_ldflags, description: 'The Data Plane Development Kit (DPDK)', subdirs: [get_option('include_subdir_arch'), '.'], - extra_cflags: ['-include "rte_config.h"', machine_arg] + extra_cflags: ['-include "rte_config.h"'] + machine_args ) diff --git a/test/test/meson.build b/test/test/meson.build index 1863c603c..873efbc07 100644 --- a/test/test/meson.build +++ b/test/test/meson.build @@ -204,7 +204,7 @@ if get_option('tests') test_sources, link_whole: link_libs, dependencies: test_dep_objs, - c_args: machine_arg, + c_args: machine_args, install_rpath: driver_install_path, install: false) -- 2.15.1