| From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Sat, 12 Oct 2019 17:46:26 -0700 |
| Subject: [PATCH] meson: Run atomics test on clang as well |
| |
| Fixes |
| ./glib-2.62.1/glib/gatomic.c:675:2: error: G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics. |
| ^ |
| |
| Upstream-Status: Pending |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| --- |
| meson.build | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/meson.build b/meson.build |
| index afb6eaa..6aa70f5 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -1692,7 +1692,7 @@ atomicdefine = ''' |
| # We know that we can always use real ("lock free") atomic operations with MSVC |
| if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') |
| have_atomic_lock_free = true |
| - if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define') |
| + if (cc.get_id() == 'gcc' or cc.get_id() == 'clang') and not cc.compiles(atomicdefine, name : 'atomic ops define') |
| # Old gcc release may provide |
| # __sync_bool_compare_and_swap but doesn't define |
| # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 |