Module: Mesa
Branch: master
Commit: b29b5a82a17e845e73ebef845176d9d1f44a2d00
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b29b5a82a17e845e73ebef845176d9d1f44a2d00
Author: Matt Turner <matts...@gmail.com>
Date: Mon Jun 11 14:56:26 2018 -0700
meson: Fix -latomic check
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.engest...@intel.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
---
meson.build | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index aefb9f3c85..375751bce1 100644
--- a/meson.build
+++ b/meson.build
@@ -830,7 +830,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'
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
