diff mbox series

[v2] net/sfc: fix broken build with clang 3.4.x

Message ID 20210722074905.1838130-1-andrew.rybchenko@oktetlabs.ru (mailing list archive)
State Accepted
Delegated to: David Marchand
Headers show
Series [v2] net/sfc: fix broken build with clang 3.4.x | expand

Checks

Context Check Description
ci/iol-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/Intel-compilation success Compilation OK
ci/github-robot success github build: passed
ci/checkpatch success coding style OK

Commit Message

Andrew Rybchenko July 22, 2021, 7:49 a.m. UTC
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 <andrew.rybchenko@oktetlabs.ru>
---
 drivers/net/sfc/meson.build | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

Comments

David Marchand July 22, 2021, 9:12 a.m. UTC | #1
Hi Andrew,


On Thu, Jul 22, 2021 at 9:49 AM Andrew Rybchenko
<andrew.rybchenko@oktetlabs.ru> wrote:
>
> Old clanng requires libatomic as well as gcc. Avoid compiler name and

s/nn/n/


> version based checks. Add custom test for 16-byte atomic operations
> to find out if libatomic is required to build.
>
> Bugzilla ID: 760
> Fixes: 96fd2bd69b58 ("net/sfc: support flow action count in transfer rules")
>
> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> ---
>  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)

Nice.


>      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 <stdio.h>
> -    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()
> --
> 2.30.2
>

Such a check will have its place in a common place if another
component in DPDK starts to depend on libatomic in the future.
But for now, this patch lgtm.
Thanks.

Acked-by: David Marchand <david.marchand@redhat.com>
David Marchand July 22, 2021, 7:44 p.m. UTC | #2
On Thu, Jul 22, 2021 at 11:12 AM David Marchand
<david.marchand@redhat.com> wrote:
> On Thu, Jul 22, 2021 at 9:49 AM Andrew Rybchenko
> <andrew.rybchenko@oktetlabs.ru> wrote:
> >
> > Old clang 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.
> >
> > Bugzilla ID: 760
> > Fixes: 96fd2bd69b58 ("net/sfc: support flow action count in transfer rules")
> >
> > Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Acked-by: David Marchand <david.marchand@redhat.com>

Applied, thanks.
diff mbox series

Patch

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 <stdio.h>
-    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()