[Mesa-dev] [PATCH 1/3] meson: Fix -latomic check

[Eric Engestrom]

On Tuesday, 2018-06-12 17:50:20 -0700, Matt Turner wrote:
> Commit 54ba73ef102f (configure.ac/meson.build: Fix -latomic test) fixed
> some checks for -latomic, and then commit 54bbe600ec26 (configure.ac:
> rework -latomic check) further extended the fixes in configure.ac but
> not in Meson. This commit extends those fixes to the Meson tests.
> 
> Fixes: 54bbe600ec26 (configure.ac: rework -latomic check)

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

> ---
>  meson.build | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 7dba52369b0..62200476216 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -836,7 +836,13 @@ endif
>  # Check for GCC style atomics
>  dep_atomic = null_dep
>  
> -if cc.compiles('int main() { int n; return __atomic_load_n(&n, __ATOMIC_ACQUIRE); }',
> +if cc.compiles('''#include <stdint.h>
> +                  int main() {
> +                    struct {
> +                      uint64_t *v;
> +                    } x;
> +                    return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE);
> +                  }''',
>                 name : 'GCC atomic builtins')
>    pre_args += '-DUSE_GCC_ATOMIC_BUILTINS'
>  
> -- 
> 2.16.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev