From patchwork Tue Apr 3 11:24:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 36938 X-Patchwork-Delegate: bruce.richardson@intel.com 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 5D35C1B722; Tue, 3 Apr 2018 13:25:26 +0200 (CEST) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0087.outbound.protection.outlook.com [104.47.34.87]) by dpdk.org (Postfix) with ESMTP id 5C7841B720 for ; Tue, 3 Apr 2018 13:25:25 +0200 (CEST) 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=imSpq8TyHsfbCiFSL3xpKhzRDFmPgJY6wfIsGW8slDs=; b=cjFoJ9R/UOkoy0t+afrSyux0kr0eRuK2KTo2gdaiIVsddfjJUejlWq+ZK+qDjMXd90UR5ZJemNQwIHR263EqKFju1BJGW7h8/I2V/bHo4qYo8aH+mrVrYBPRJog5N9caU6GQfDJlZtQGs0L8eFLggbcAalB4vD5T+cVkp4qSkEA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from ltp-pvn.caveonetworks.com (111.93.218.67) by CY4PR07MB3464.namprd07.prod.outlook.com (2603:10b6:910:75::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Tue, 3 Apr 2018 11:25:21 +0000 From: Pavan Nikhilesh To: thomas@monjalon.net, jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Tue, 3 Apr 2018 16:54:52 +0530 Message-Id: <20180403112452.12567-1-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180402182823.30688-1-pbhagavatula@caviumnetworks.com> References: <20180402182823.30688-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: MWHPR15CA0058.namprd15.prod.outlook.com (2603:10b6:301:4c::20) To CY4PR07MB3464.namprd07.prod.outlook.com (2603:10b6:910:75::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 66aa125c-3341-4f8d-d634-08d59955973c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:CY4PR07MB3464; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 3:7+3OxxpHbgo+Krwuqj1nFgidY6rbFW84/zReA5jfwUqmyvBWkbcdw4ujHVQJLt/loM/SYeiB0KkBazTQ7jivn7z6fv+3iVgKgBm1uEcnfR5xD1bZEKMYfUqC/5KYUVgcOSX3h1m+eJZF06qQe4Reu7n/2VuMebuJjcbN4HdY0sEKGLlOPtkB4J2ySGHG7V6TeUaLWmv5nVgijJCX1nxUp1J1GiMpLM1XTbgc2dpiEqf4223qt8mMcuGPdkmRonTf; 25:PAfZEBKP7ThX8Z9ORuC8rB4HMrfHVbSpxw+hk64W37IV41/Gv32L7gB7cl5NMvJ2KNmP8x0h1UtQOlSMSuwkB6Mzt3XSC3UXAGqJBPFTltbqDc1kMHz1rCK9lPw69TqDLxf5XR11n8KLn8GDxwjshyxXASy3X3fbhlW3YOZa0GUhPEYECdLZ2urxM7QfJOxs2lhKORObgGuGS4LiWvtalS8J5b2kT3scZGGCj8xB3ShSwvG5/Zv3OXvSwm4iC/WeyAKtws6NKpKXvWMkb0KcRc43n0l1Axx/I21NYs5E2lSSL5Bc9LZSbLJJ3I9hihKiVVZ4F7fdDNOK2ikhITqLuQ==; 31:mLIJSL2EiX9YZRhEK105fMUqZqW0WRqmHWMjgd7v9DMEe9A1DvNHMC/yX7jditfPRMMs/VlJ1eh31dOjJvvDIVVvSRTiZeWAYrD739d1+CuBjRieS9mIge6JG5w4H8MqQiMCAeTIfkrgJ+qTIh7Q5H9l+OhL3gk5FpJ0dVCvh4RaN3jre7lrBHx+dBfeaU3NNq3qo6319JIIBk9a5ymfV7zlYPjuWByHix6VG6ETtDY= X-MS-TrafficTypeDiagnostic: CY4PR07MB3464: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 20:74VdvfRUQetlZXvCUmU5IfTSfQajNWYj8nxOxgL+MwHT65wHOSqcm2nVVV0VtiZ57Y1G2z1JW+B5FMu6BrVImQ9NOx4sZzmkLrTNPZcNj9kNbhOGIuRRD9M9Gdy7qC6nduwZQInnTwKdgU99fkzTnWEE/VLtTNH4hArIGOfQ5M8ffYtVSOXblnqQL9hhTOwR681HyB6D8hqWQC1eDZKtS0LB9yrVIoE4oexDJuAMLZlYDI0dbgROYbX4ZLMcA+CNE5pn81JegOZ/QBrflTPF7qDroziUxvcThDX2Gdq3KAF/H0T1R8Yue7d3buR4SU0RI5xQTinkvOOP/k5HF58nngg1LOY2xMJsTmQee3FKeh8P4pNCvgCv2ZS59LMQCtKm5NZ7QAp1NYz4QpdJ30Glo9B5+fza1HmgYxq7WFSXo865NrU8EUhv3BkBRX5APMYvL3WvwD+oXqpdxhlPZrdVCv+VDjsIw+34SgUX3/EvRhNFZ5LK26bcCLhtEfO2eAqLwPMuMc0k4rponvdoNDOlaKkG5+IFjQnLV4zqYM9iEOyaBeCYFxf23s2miGkdnKwWjuAagDeHySoZA0cczBUyIuElYsLBEXs9RDeYl0y/pY0=; 4:2pB793UbiYXYSgs25kbNtpE8kInW8lYnvpf4/2Bf+PrzDSywCkh/0vm8VufyWRHP2j6PjEq1xfNMHRamXBNEQ5dmB6t5fqu8U7wnRXzp/yH4MFgqfTClGIuuSeaZe0lD0HjwEoCo1swSbijRXvbnJBxjvZUCCMgLmi9q1JTlEvQshRsEHsAPazk7OpcKlC8NrUAvs/Rms62A21SiRU94L/+A3py9iFMYhgQeqTtJj9pujrNC4lUuw2FM6XeYYiO2CTmzfZH/AzgE9Ck5aUi/cGQns4dYrclZMidz0eRDAAbjWvm9Cn7RV0fqiuxLj5cu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:CY4PR07MB3464; BCL:0; PCL:0; RULEID:; SRVR:CY4PR07MB3464; X-Forefront-PRVS: 0631F0BC3D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39380400002)(376002)(366004)(346002)(39860400002)(199004)(189003)(7736002)(3846002)(6506007)(105586002)(81166006)(16586007)(956004)(2616005)(6116002)(6666003)(26005)(53416004)(107886003)(1857600001)(2906002)(1076002)(5009440100003)(478600001)(8936002)(305945005)(4326008)(386003)(68736007)(47776003)(16526019)(81156014)(5660300001)(8676002)(48376002)(69596002)(50226002)(42882007)(51416003)(97736004)(486005)(316002)(6486002)(53936002)(11346002)(76176011)(50466002)(66066001)(186003)(36756003)(476003)(25786009)(106356001)(486005)(72206003)(6512007)(52116002)(446003)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3464; H:ltp-pvn.caveonetworks.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3464; 23:cT+23JR6t0YEYa6kq7WudJQ0zt+9/B1U6veB+6RHX?= EuLb2daEPZxoek1j1VEJta/veLXOmbbtZ8gvnSxP2Wd7s/GzJkwKwwYu5zNG6/sDIsDp87HR1hZgapRs5qyGUAGbUDFL8yvW/u9SdtRfznADx8cztliIUSQrCHSMgcZaf2Wam6UAOSJSczGV+elTJp+4z8WtnoZpulm4MLMzOOnbCjgIgGOZ6RV+1pGXfIb5aozGMW389EjeS3yhuo+Sn0+SeWTK728byqJO0i16xAqQws+N785+vJ94KdcXp731LmoQBS5eWoG1IJXs18w+OWU80gXozyYgeXS2KAkpTsWn+iPjTWYsXmwTrMyEnxd8n4LnRAvQq9xMqWYfPiJ7+JsGd+Udc6vuLVuY67zd3Ec4BFBRdqOvBWZXIEyq/qQfQsfMBg7QU1LwVrsIM5dka284IWUSwMEc9+QD8tsUdNJCxdpZ1OGrsQDF0e1n5flGBJHuPK6wztUooQeAyV3g++0FFExQJ8QvGV1sT4Ae9aFjYbEmFS0x1Mz5PfiKFUKlqxm9Z69WTIS880jNIttv0jqtzNkULqanI++U6b+0hdMww9+c2nqDhIaNl7c8IuP3ULRVVwXf3yVxtw/q/GN+Fj4Pa43JY6D9rnBrnRXiPX3yldgcIQLaEfBP5cLHB/FiGXJFKiFwIBebVsEffOCxtNQiuZ30ymNnnMRDvRfEJMVyb3Dvl7QkrCw1cy665M9ZMwFDkMHQ4RkThHC3mhvzlz13xYS+mmSCqupaCe1E+MCM+INALbBlr69aoJBOoDiuK39sJX/IlMD64wutZjdNv2uF1XNw5Y5H7tuphlVplj0sE/dVvsnMxAPngWnSUt56zmbIeugIMC4ekxuyTKw3n3pqihr1+MImyUxF5/0rohj508zBY/rUSmL3niyHg3ZxfFiAZU0DihaeNcDrg2B46MzGU4wCiuHKLHveMWW2EZAadtuOJ8+f+gDP7LZ8V45m4H+1brKiFnBS+TQCzSJABvgPQ/Nn0U51Wpc6ORoY8+L3VeMDgff2jLLpr83x1PxzbhpUt8QBMXL73i5Wrf98p1Xdn1Ljk4d2iXXRoM9uvom2bm8kqnjD9vgrEHqyffbHIqMo0lzctSCh63ltCK9pFey/t/m2JoUVIZ13xYf7bZKl0vKR+GqaDOXH7Qp/z839xQzNr1xXZm9y6hr/7yK2qP2BPJj5aEAN9R93FGUIKk9LH9MTXLX+s9ZLDF/EyLYm6ZQzy2reOtI6sXY8VLXxSmwNP3c0fubtKWyXgKqJWkQnFdz+NuLWuLBZKJdHo2hA3Un1EokEIxv+HQIj1NsImmfM/Nsi7lRAM3bI1AtyK9pSA== X-Microsoft-Antispam-Message-Info: OJmuCXHv8IhDoqcJQDyN4y+Y7ddeMNlohMkxycOVuWvQsuuBjKEObKSpxbRZhDdAxd5l8CW1SHDLm3gUPrJyTmgncHpv9V/7wq00RKUkmrOtZePVG+GJ9iVpwMiGm4cjb3t139E9aD5SIdQyI7T3wZceod5CqSKO8WXD1KbRQGatlmlrS36FY+AaSnz5F8tu X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 6:2scvp4pQc/rNtSfkWs2Egng2z+fFFltBMZyjJEQAM0SPoA/M3zvZXnFmFlnEKuxILLjqWX6NkMrfJoOkYaZ3xr13UcTboD7aW0OCjAUs5umrfI618FvuOuZsSI1qsiL9PcfI0xXm9ZGfc/J95xhEZH7mxAz5QMQE1kO68XusIp1V7T+cU44an+PcPtjbYJcFye13DZPyiJIhksvn/CtxKeuFSHndxaBUSkOWCQwJrv7RkaGnxNdROr5maxud9pizRCqHASlvYT2bam5ds0YTVOduZickWj+k9xE4AcCkenw+CGzfTF/z498zs31vYciRh5d8zwAwnp57UE2ZDQJgBeblXexwB9CWG9xWd7gEO01WjnT525OSmyugvkDyuVpXKe8jzdQ6SBO+yscz6bCpIjdsRV6em7S9tJnZc7/s7rmVEQKm9z2k+80YA/u+qX1FjtH4P0Vt4DdOLyUh3poGWg==; 5:/2BfCWDiPYKK3s/dD2vvAXVydUkmazSJWqLzTg8AZELpE+ILKDDK/+Z2Zxi2xe9zmzECz/PrcEEN3IJi2AjWl9m/0NSJ5Z7mGc6n2bEmnZfSyrNvS7JuWah/2w8hNO0gUXNUdQrhG9qpfUWCF8z4GAMcd3aQsTbhdmApxMru5F0=; 24:kwEXfFBKQ2n8BLO4o2Ds+h3xJjh1UBlczhPXgGUOEVqjvF715Nfi18nJBiPY1fZPUyPSgrWO0I5TTjNuAzo+FgZdW/ZXrn+S4XjGqaFLDi0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 7:9Y8nx8u51C5CRzhXMSsBV1P0OQTR68pHqTdqFxFRKZiYLQfX/WS+rQ3esoy7wTWFmCRcP2HJSvxWuH+YJB+Q4ZXbtdNnYsy5KrTKW4cVy8vk4hW/ZCyBXtqok63T/cRIEyMxB2xIsFY7z+/P7Xyxjux6yJAdsSzQinWcxG/GonT30jaOx2Y5JjNC/4ieNTyZVtujHQ+eQGVPKv3/5di3zdIBgTY9RzlnJavg1DXkB9bE891ykfXWC8Dbkk1T8wqi X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2018 11:25:21.3753 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 66aa125c-3341-4f8d-d634-08d59955973c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3464 Subject: [dpdk-dev] [PATCH v3] build: meson set toolchain info during config init 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" Meson identify toolchain using cc.get_id and set RTE_TOOLCHAIN, RTE_TOOLCHAIN_X during initializing dpdk_conf so that it can be used by both x86 and arm. Suggested-by: Bruce Richardson Signed-off-by: Pavan Nikhilesh Acked-by: Bruce Richardson --- v3 Changes: - Use a generic way of setting toolchain instead of chaining conditions.(Bruce) v2 Changes: - Use get_id for identifying compiler instead of checking for compiler defines manually.(Bruce) config/arm/meson.build | 9 --------- config/meson.build | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) -- 2.16.3 diff --git a/config/arm/meson.build b/config/arm/meson.build index c1ab6ed01..e9c9eb1a5 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -83,15 +83,6 @@ impl_0x69 = ['Intel', flags_generic, machine_args_generic] impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic] impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic] - -if cc.get_define('__clang__') != '' - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'clang') - dpdk_conf.set('RTE_TOOLCHAIN_CLANG', 1) -else - dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc') - dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1) -endif - dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) if cc.sizeof('void *') != 8 diff --git a/config/meson.build b/config/meson.build index f8c67578d..d4df36cd0 100644 --- a/config/meson.build +++ b/config/meson.build @@ -11,6 +11,10 @@ dpdk_conf.set('RTE_MACHINE', machine) machine_args = [] machine_args += '-march=' + machine +toolchain = cc.get_id() +dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain) +dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper(), 1) + # use pthreads add_project_link_arguments('-pthread', language: 'c') dpdk_extra_ldflags += '-pthread'