From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9FD0CA0C46; Wed, 9 Jun 2021 09:27:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 269B440FDF; Wed, 9 Jun 2021 09:27:55 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2053.outbound.protection.outlook.com [40.107.22.53]) by mails.dpdk.org (Postfix) with ESMTP id E53C340E3C; Wed, 9 Jun 2021 09:27:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aZSBJBFhbqHkt4Wg2UgPU6lhtYcQ2jz1u/Z4Ol0bbjE=; b=wgY2j6xFDc7uk0kPvTrdEBJlDk+QEEVU/1sB0Ig+LEaCLw1zTij+Xeo+GpXgd2d4wT2xZygGVyrH556LSQ1fu+fbjqMjTG2Qm6V3ElfkMFyLeEVyAc6F3H1HTqg1SgVuZYUXSG2XnF2foEL7n74cnFEV/ds8dOc164FiXY/crQI= Received: from AM6PR10CA0057.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::34) by AM6PR08MB4439.eurprd08.prod.outlook.com (2603:10a6:20b:be::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Wed, 9 Jun 2021 07:27:52 +0000 Received: from AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:80:cafe::de) by AM6PR10CA0057.outlook.office365.com (2603:10a6:209:80::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Wed, 9 Jun 2021 07:27:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dpdk.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dpdk.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT015.mail.protection.outlook.com (10.152.16.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.21 via Frontend Transport; Wed, 9 Jun 2021 07:27:52 +0000 Received: ("Tessian outbound f02dc08cb398:v93"); Wed, 09 Jun 2021 07:27:51 +0000 X-CR-MTA-TID: 64aa7808 Received: from 33d8d211809b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F373A2D1-27D9-451F-AE7E-EECD632D3D20.1; Wed, 09 Jun 2021 07:27:45 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 33d8d211809b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 09 Jun 2021 07:27:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZHBQooI8nWhC0lbyoFW7xHwMZOIJk7MIyoBh1WjgZyG2XXKVuKBdn5L5bkgBC0xuO2H0r7V7889JopWP/z/EM6GxbPVY/G7mG4HEsb54fSlEZQCv3AeGOqvXwMlg939MGEV1R9V+xYOlFCqeZYByWy2MgEs0UeC7XU2bG4yYfrx1tkz0NqUVBQGFpY3xLJT643DHwH3O/sG5y+gLqrwlBmDxNN7QvzpgZEl8y/CmcXGep7kQ88pOrJyFXkKqryahkckXZ/1+Diuwab/ZG5JwO6TvyNJGyy1qf8BAYPsYEeuF5HfEO6aptJdIzYlNEmI4IEqjUorh2U/hYqnUz9UDhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aZSBJBFhbqHkt4Wg2UgPU6lhtYcQ2jz1u/Z4Ol0bbjE=; b=KsQ8FEOssDFfmCfFBuAb7UcoF75SKKLlVTyc4/H8ZhFupG6U0QsWyNPHiN+D69/COWpyuUUwlUnHRdsHexSyIEaX127Rp8e9vEpAYaau/uNJKxQI3ok+oJ4BsaJEbOyyccer+1f5m5iSJAlzd/V7ZrwD1c5kSgaimqwrNsolScYkw01qiawPVekihbbnhWSZJblD7hydoacdE82qOlKXAm1GIW2XS2uPIIA+GB1ag/7ExN5CJkxL5irbx+GluYl0v73oFIuqCW11xZWByw4a/O6CyNWte+6gDfXuHqcE6rEQt0gXF8IgkZnpSPzeoIACmzsVSuDSGCwU7thPJe0mNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aZSBJBFhbqHkt4Wg2UgPU6lhtYcQ2jz1u/Z4Ol0bbjE=; b=wgY2j6xFDc7uk0kPvTrdEBJlDk+QEEVU/1sB0Ig+LEaCLw1zTij+Xeo+GpXgd2d4wT2xZygGVyrH556LSQ1fu+fbjqMjTG2Qm6V3ElfkMFyLeEVyAc6F3H1HTqg1SgVuZYUXSG2XnF2foEL7n74cnFEV/ds8dOc164FiXY/crQI= Received: from AM5PR0802MB2465.eurprd08.prod.outlook.com (2603:10a6:203:9f::22) by AS8PR08MB6326.eurprd08.prod.outlook.com (2603:10a6:20b:335::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Wed, 9 Jun 2021 07:27:35 +0000 Received: from AM5PR0802MB2465.eurprd08.prod.outlook.com ([fe80::e890:2ff8:8cdf:83b2]) by AM5PR0802MB2465.eurprd08.prod.outlook.com ([fe80::e890:2ff8:8cdf:83b2%4]) with mapi id 15.20.4195.030; Wed, 9 Jun 2021 07:27:35 +0000 From: Ruifeng Wang To: Michael Pfeiffer , Jan Viktorin , "jerinj@marvell.com" CC: "dev@dpdk.org" , "kosar@rehivetech.com" , "stable@dpdk.org" , nd Thread-Topic: [PATCH v4] eal: arm: fix out of tree build Thread-Index: AQHXXFEj/JP5ll9jPkSGAmAKZ5y+WasLPrxw Date: Wed, 9 Jun 2021 07:27:35 +0000 Message-ID: References: <20210608102901.156032-1-michael.pfeiffer@tu-ilmenau.de> In-Reply-To: <20210608102901.156032-1-michael.pfeiffer@tu-ilmenau.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: F076880087064443AD0DD02CA61C7DD3.0 x-checkrecipientchecked: true Authentication-Results-Original: tu-ilmenau.de; dkim=none (message not signed) header.d=none; tu-ilmenau.de; dmarc=none action=none header.from=arm.com; x-originating-ip: [203.126.0.112] x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: 6f9240fc-ad91-4235-835c-08d92b181764 x-ms-traffictypediagnostic: AS8PR08MB6326:|AM6PR08MB4439: x-ld-processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:1850;OLM:1850; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: jV2FB0OY0sNYS6hcvRo3KduHbULokgB+4E5GfNhnai+Ev0Gr7J+bMXxbMAaybS38VJLBoKF83VyKG0DTfhJSq98W1jxyc12Ey5GOhWs9I18SrCPnt08WGgd18zltBejddfRYXAojpY+z6Fl1szKG3opmh9XpDusCMMhDHREH88phCQcFM2hwFt2QQw+WW2Og08dE0pvyAHc5QnyIpP8U6yWq9h4bBVLiIwBNC09n4JYdcQyQYxGOE/BiAQYmqYo+iXa2IIO+MaUJbDMHmCJKJBZ7qFWwkl8k6pu+h4jEn7QJAY37veblDIlf54Is7rl0ELMc+FxpEfnBl2OzSmlmuHYCqH7gHXyMbXhc1hJaOTDELnzR9uAXDm7tF2lomiUrvN9Vze187aVtkUzNfOrizUw/yW46VxODaYRZDtOFuz57BQu8S0dDEVdTsa6RuApCtL5vBIOTsk3R39Qkicela0zWnF3xlK1xI44ESQ0U0nHC9cQBb7sr0P9L5hGGPW3LfAM/4uVD1g0RzPupkvZnQpfKneXTGbVMeS5ohTfa+2i/RXdTfG77RlhFy12Ois4s1HUX0pIPQ4N30nqTKFkgbT2cYNeyY30xdA6DmloM0UU= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM5PR0802MB2465.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(366004)(396003)(136003)(39860400002)(7696005)(26005)(53546011)(478600001)(186003)(110136005)(6506007)(54906003)(64756008)(66946007)(4326008)(8936002)(66446008)(316002)(66476007)(66556008)(76116006)(5660300002)(86362001)(52536014)(83380400001)(71200400001)(38100700002)(55016002)(2906002)(33656002)(8676002)(9686003)(122000001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?rpl5AbJNhsITvFLP8zf64YpHmcI//f1eKeYRjx3NgCGy9RAcH3pcseoOZiNz?= =?us-ascii?Q?kp9fwCHz8LLUuzQn26wHJyWrEORKzUJriR4dGnYKr5VrdIqrVyG18XcrGhTE?= =?us-ascii?Q?psYUJkorweHp5SjC+j9i4a8+KRvvruwm5VgDH9rmOhko+YKqgmKdOouDuhwT?= =?us-ascii?Q?b3hstgIZMI4H1Y80V7JWZaiTWDkmc29j6DaJxLrmpuGbCRwCg4qn0qicNeaI?= =?us-ascii?Q?Uns7PfWP/oF48dERofxobxn5cN6ZLl2lnOVaG+SxNvN0K9luWGecmyN6aJCd?= =?us-ascii?Q?vQbDguGso7eTV1qdVwUI9pFLhrMBMcKZexpl5gd0WXOPDqn8C/VDy4piqbse?= =?us-ascii?Q?tifohXNU/HhY8TsW8icU1UpZqO/nslU+aOUw+KkU5cP3SidOMMwAirnyQAfh?= =?us-ascii?Q?/qJoPR8WzvQohpHwKP8YZ/TlraFAIfjGolH6U4/U6Qrx/A0vtyV7ieGL3LYv?= =?us-ascii?Q?GzSeJIR+u+uuvj5YD8Do3e6bNQIQ38NxxtYlzteFs8Cb85Zar/Nr70UCxgi8?= =?us-ascii?Q?fnwZ2tM8YsaTjClmiBE4qZYjvh9o9ncmE8ao9xZOcxWW/JGj7MUL6tmJ3+Fr?= =?us-ascii?Q?m5AhQ11Vw416SRdEBiWGfmuJmdiD9gAfaggtW6Xn0pQro4pT7rMgSaLvU/Se?= =?us-ascii?Q?AVKpYg19CnIqFgooVoHkzhsT/BfcIcXbgQh7mshg3+25GoNg/PL8l+9sBNes?= =?us-ascii?Q?pqqjFAKymridBVNm8ZFWdU9Tj2QuvpCBXri3ZBBm2d2Exp92aiQenZJ1V6pW?= =?us-ascii?Q?LTz1LVa+ekLqldyTuHS0RB+Y0dAi9usYdK8IoIi/2PKM3aYHyQu7w3o+wtQ3?= =?us-ascii?Q?VNfx8f2dhfu9ItKajjiCPWrxCilka8XwurFkVvCnp/z2UnjTPScSPZH8z6Rw?= =?us-ascii?Q?FZt0Y2kbsYx0URLiJ/GU9kEENs59Gp4GzCcQ5do18Ad1Ccp1CG6kfZijQhjv?= =?us-ascii?Q?iiiK6f/0uptUVNogKpS5f1+1PkSo/kbf1fYXY7N529V1dsNBmtRHlm44yKIK?= =?us-ascii?Q?yEHIvfrVrKYNmlcBQPv2C7G4TDQ+3hkOzhGjKQz+f5zX3Ys7IZdTOFCdanUK?= =?us-ascii?Q?1KhaVqPg2LSqK/h8dLgiswk/vH2l/qQBKJENBUmtFp/obnCnDOwXv7HGtT3l?= =?us-ascii?Q?dFxEOBG5HzfwSX6IKTggT7lxz1p6jNtO+bNN46DqDFHg7T3cPo1pDCnSW/UT?= =?us-ascii?Q?d1BlQLSNDHnSVNoZzJFQJLmTRPSC4MQt8/6dylfzH6uJFhv+km6zisyGH3Oo?= =?us-ascii?Q?zwLxcKB1fjZCibP5vcwfj0467Jdq34lTFETm1tcpyOAHAT5QT5zXlnDA/Jau?= =?us-ascii?Q?QQoTmo3AS3Zsge9JpDpwNX5Y?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6326 Original-Authentication-Results: tu-ilmenau.de; dkim=none (message not signed) header.d=none; tu-ilmenau.de; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: c5713eb4-7811-4caf-fc1e-08d92b180d6b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 95QsSwXTJ7TrnQ6boKTF2xwlcS1rHr2GfgE8TtIJtAzcf9RjvNt4LcVEp0Q207R6PzIsdvK48UAXzMG5oc60yu8WayNA0pGnZBFWc7kt1DMygtQvIQEW9LjU+7nRboo0YeiuK8OM9C7+bMw7vuwkI/vuMd380mbxPnUAC7/+SIljy93ru3AG1HRUhGe7klVvHTsCUBST4OVpMkfvpHFLro5vJLMZn1qCiFY1tsy8UZeXnyhECeNZO374Ee3+Q1Ok2JLEUWwVCHYhJHoRTVt6tN4UewvIS/8MirSREnNf/BjdjtaQ/SthWRSrPtY8xFBBPK3LC6Qmu9n1PjsIsgv6mApaoNSk82NlfmgpUCQGrg18FpsbxkKzUVNBLMfmBEbg/LKwboFMpMlPLRrKQvAQf6HxMyzdnjr0bOGeIPy8QK14kDTCxbG8UJ6v57g19HiEzVZBNMW7ia5qzMZ5EBrbOoNxeMcryKSTwX4qW2A2HTCeny/O4tnXRhQmEJNWTR7bSnvn49XIxkZ2rDRIzHEBi+B1xBRTFQfmrOY1HcbC0Z8OVUDz16wjOZ8gNS3GcGT2lF66/8n5YD5Ve1Fe8p2PDkJzm3ople2kXBxfvlbgopIbl41CYYAG363Bjau9BWdVPBL3GdCLrEAXDM0WkareFw== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(376002)(396003)(136003)(39860400002)(346002)(36840700001)(46966006)(81166007)(2906002)(356005)(5660300002)(52536014)(36860700001)(47076005)(110136005)(54906003)(70586007)(70206006)(55016002)(82740400003)(8676002)(53546011)(6506007)(478600001)(316002)(336012)(33656002)(9686003)(86362001)(4326008)(450100002)(7696005)(8936002)(26005)(186003)(82310400003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2021 07:27:52.0169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f9240fc-ad91-4235-835c-08d92b181764 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4439 Subject: Re: [dpdk-dev] [PATCH v4] eal: arm: fix out of tree build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" > -----Original Message----- > From: Michael Pfeiffer > Sent: Tuesday, June 8, 2021 6:29 PM > To: Jan Viktorin ; Ruifeng Wang > ; jerinj@marvell.com > Cc: dev@dpdk.org; Michael Pfeiffer ; > kosar@rehivetech.com; stable@dpdk.org > Subject: [PATCH v4] eal: arm: fix out of tree build >=20 > Including various headers may fail for ARM builds with 'Platform must be = built > with RTE_FORCE_INTRINSICS' if rte_config.h is not included before. Move > the error message after the includes to ensure rte_config.h is always > included. >=20 > Fixes: de966ccdcd7f ("eal/arm: add byte order operations for ARM") Thanks for the patch. More fix lines should be added: Fixes: 17d5fa0fa90d ("eal/arm: add atomic operations for ARMv7") Fixes: d708f01b7102 ("eal/arm: add atomic operations for ARMv8") Fixes: 2173f3333b61 ("mcslock: add MCS queued lock implementation") Fixes: 7860c3965483 ("eal/arm: add spinlock operations for ARM") Fixes: ca49b92079df ("ticketlock: enable generic ticketlock on all arch") With the change: Acked-by: Ruifeng Wang > Cc: kosar@rehivetech.com > Cc: stable@dpdk.org >=20 > Signed-off-by: Michael Pfeiffer > --- > v4: > * Apply to fix to rte_atomic_{32,64}.h, rte_{mcs,spin,ticket}lock.h as > well. > * Remove unnecessary include of rte_config.h. > * Adjust commit message. >=20 > v3: > * Proper in-reply-to. >=20 > v2: > * Fixed subject line. >=20 > lib/eal/arm/include/rte_atomic_32.h | 8 ++++---- > lib/eal/arm/include/rte_atomic_64.h | 8 ++++---- > lib/eal/arm/include/rte_byteorder.h | 8 ++++---- > lib/eal/arm/include/rte_mcslock.h | 8 ++++---- > lib/eal/arm/include/rte_spinlock.h | 8 ++++---- > lib/eal/arm/include/rte_ticketlock.h | 8 ++++---- > 6 files changed, 24 insertions(+), 24 deletions(-) >=20 > diff --git a/lib/eal/arm/include/rte_atomic_32.h > b/lib/eal/arm/include/rte_atomic_32.h > index c00ab78dba..138abd3a8b 100644 > --- a/lib/eal/arm/include/rte_atomic_32.h > +++ b/lib/eal/arm/include/rte_atomic_32.h > @@ -5,16 +5,16 @@ > #ifndef _RTE_ATOMIC_ARM32_H_ > #define _RTE_ATOMIC_ARM32_H_ >=20 > -#ifndef RTE_FORCE_INTRINSICS > -# error Platform must be built with RTE_FORCE_INTRINSICS -#endif > - > #ifdef __cplusplus > extern "C" { > #endif >=20 > #include "generic/rte_atomic.h" >=20 > +#ifndef RTE_FORCE_INTRINSICS > +# error Platform must be built with RTE_FORCE_INTRINSICS #endif > + > #define rte_mb() __sync_synchronize() >=20 > #define rte_wmb() do { asm volatile ("dmb st" : : : "memory"); } while > (0) > diff --git a/lib/eal/arm/include/rte_atomic_64.h > b/lib/eal/arm/include/rte_atomic_64.h > index fa6f334c0d..2907a95196 100644 > --- a/lib/eal/arm/include/rte_atomic_64.h > +++ b/lib/eal/arm/include/rte_atomic_64.h > @@ -6,10 +6,6 @@ > #ifndef _RTE_ATOMIC_ARM64_H_ > #define _RTE_ATOMIC_ARM64_H_ >=20 > -#ifndef RTE_FORCE_INTRINSICS > -# error Platform must be built with RTE_FORCE_INTRINSICS -#endif > - > #ifdef __cplusplus > extern "C" { > #endif > @@ -19,6 +15,10 @@ extern "C" { > #include > #include >=20 > +#ifndef RTE_FORCE_INTRINSICS > +# error Platform must be built with RTE_FORCE_INTRINSICS #endif > + > #define rte_mb() asm volatile("dmb osh" : : : "memory") >=20 > #define rte_wmb() asm volatile("dmb oshst" : : : "memory") diff --git > a/lib/eal/arm/include/rte_byteorder.h > b/lib/eal/arm/include/rte_byteorder.h > index df2f1d87ba..c00bebf680 100644 > --- a/lib/eal/arm/include/rte_byteorder.h > +++ b/lib/eal/arm/include/rte_byteorder.h > @@ -5,10 +5,6 @@ > #ifndef _RTE_BYTEORDER_ARM_H_ > #define _RTE_BYTEORDER_ARM_H_ >=20 > -#ifndef RTE_FORCE_INTRINSICS > -# error Platform must be built with RTE_FORCE_INTRINSICS -#endif > - > #ifdef __cplusplus > extern "C" { > #endif > @@ -17,6 +13,10 @@ extern "C" { > #include > #include "generic/rte_byteorder.h" >=20 > +#ifndef RTE_FORCE_INTRINSICS > +# error Platform must be built with RTE_FORCE_INTRINSICS #endif > + > /* fix missing __builtin_bswap16 for gcc older then 4.8 */ #if !(__GNUC= __ > > 4 || (__GNUC__ =3D=3D 4 && __GNUC_MINOR__ >=3D 8)) >=20 > diff --git a/lib/eal/arm/include/rte_mcslock.h > b/lib/eal/arm/include/rte_mcslock.h > index 896d678073..915a3ed647 100644 > --- a/lib/eal/arm/include/rte_mcslock.h > +++ b/lib/eal/arm/include/rte_mcslock.h > @@ -5,16 +5,16 @@ > #ifndef _RTE_MCSLOCK_ARM_H_ > #define _RTE_MCSLOCK_ARM_H_ >=20 > -#ifndef RTE_FORCE_INTRINSICS > -# error Platform must be built with RTE_FORCE_INTRINSICS -#endif > - > #ifdef __cplusplus > extern "C" { > #endif >=20 > #include "generic/rte_mcslock.h" >=20 > +#ifndef RTE_FORCE_INTRINSICS > +# error Platform must be built with RTE_FORCE_INTRINSICS #endif > + > #ifdef __cplusplus > } > #endif > diff --git a/lib/eal/arm/include/rte_spinlock.h > b/lib/eal/arm/include/rte_spinlock.h > index a973763c23..e29ddab89a 100644 > --- a/lib/eal/arm/include/rte_spinlock.h > +++ b/lib/eal/arm/include/rte_spinlock.h > @@ -5,10 +5,6 @@ > #ifndef _RTE_SPINLOCK_ARM_H_ > #define _RTE_SPINLOCK_ARM_H_ >=20 > -#ifndef RTE_FORCE_INTRINSICS > -# error Platform must be built with RTE_FORCE_INTRINSICS -#endif > - > #ifdef __cplusplus > extern "C" { > #endif > @@ -16,6 +12,10 @@ extern "C" { > #include > #include "generic/rte_spinlock.h" >=20 > +#ifndef RTE_FORCE_INTRINSICS > +# error Platform must be built with RTE_FORCE_INTRINSICS #endif > + > static inline int rte_tm_supported(void) { > return 0; > diff --git a/lib/eal/arm/include/rte_ticketlock.h > b/lib/eal/arm/include/rte_ticketlock.h > index e66beefbe2..22eb40fb66 100644 > --- a/lib/eal/arm/include/rte_ticketlock.h > +++ b/lib/eal/arm/include/rte_ticketlock.h > @@ -5,16 +5,16 @@ > #ifndef _RTE_TICKETLOCK_ARM_H_ > #define _RTE_TICKETLOCK_ARM_H_ >=20 > -#ifndef RTE_FORCE_INTRINSICS > -# error Platform must be built with RTE_FORCE_INTRINSICS -#endif > - > #ifdef __cplusplus > extern "C" { > #endif >=20 > #include "generic/rte_ticketlock.h" >=20 > +#ifndef RTE_FORCE_INTRINSICS > +# error Platform must be built with RTE_FORCE_INTRINSICS #endif > + > #ifdef __cplusplus > } > #endif > -- > 2.32.0