From patchwork Thu Jul 22 07:49:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 96191 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D531AA0C4E; Thu, 22 Jul 2021 09:49:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7773F4014E; Thu, 22 Jul 2021 09:49:12 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id C6E634014D for ; Thu, 22 Jul 2021 09:49:10 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 122) id 6C2177F596; Thu, 22 Jul 2021 10:49:10 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id BFFAE7F52A; Thu, 22 Jul 2021 10:49:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru BFFAE7F52A Authentication-Results: shelob.oktetlabs.ru/BFFAE7F52A; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: dev@dpdk.org Cc: alialnu@nvidia.com, David Marchand , Bruce Richardson Date: Thu, 22 Jul 2021 10:49:05 +0300 Message-Id: <20210722074905.1838130-1-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210722074651.1837621-1-andrew.rybchenko@oktetlabs.ru> References: <20210722074651.1837621-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2] net/sfc: fix broken build with clang 3.4.x 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" Old clanng requires libatomic as well as gcc. Avoid compiler name and version based checks. Add custom test for 16-byte atomic operations to find out if libatomic is required to build. Fixes: 96fd2bd69b58 ("net/sfc: support flow action count in transfer rules") Bugzilla ID: 760 Signed-off-by: Andrew Rybchenko Acked-by: David Marchand --- drivers/net/sfc/meson.build | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index 4625859077..a1ad792b80 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -40,8 +40,20 @@ foreach flag: extra_flags endif endforeach -# for gcc compiles we need -latomic for 128-bit atomic ops -if cc.get_id() == 'gcc' +# for gcc and old Clang compiles we need -latomic for 128-bit atomic ops +atomic_check_code = ''' +int main(void) +{ + __int128 a = 0; + __int128 b; + + b = __atomic_load_n(&a, __ATOMIC_RELAXED); + __atomic_store(&b, &a, __ATOMIC_RELAXED); + __atomic_store_n(&b, a, __ATOMIC_RELAXED); + return 0; +} +''' +if not cc.links(atomic_check_code) libatomic_dep = cc.find_library('atomic', required: false) if not libatomic_dep.found() build = false @@ -51,11 +63,7 @@ if cc.get_id() == 'gcc' # libatomic could be half-installed when above check finds it but # linkage fails - atomic_link_code = ''' - #include - void main() { printf("libatomic link check\n"); } - ''' - if not cc.links(atomic_link_code, dependencies: libatomic_dep) + if not cc.links(atomic_check_code, dependencies: libatomic_dep) build = false reason = 'broken dependency, "libatomic"' subdir_done()