From fd3ed5e31bc0d3d6a0a34d6482bb2ae10f186c06 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 15 Nov 2019 10:28:21 +0000 Subject: [PATCH] gatomic: Temporarily disable C11-style atomics on FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They’re causing the CI to fail. While someone familiar with FreeBSD investigates the failure, it’s easiest to disable all C11-style atomics than add more preprocessor checks to only disable the atomics added in !1123. If nobody can fix the new C11-style atomics before the 2.64.0 release, this commit should be reverted and a more comprehensive set of preprocessor checks put in place to essentially revert !1123 for BSD only. Signed-off-by: Philip Withnall Helps: #1940 --- glib/gatomic.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glib/gatomic.h b/glib/gatomic.h index 092589454..646a30df4 100644 --- a/glib/gatomic.h +++ b/glib/gatomic.h @@ -85,7 +85,9 @@ G_END_DECLS #if defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) /* We prefer the new C11-style atomic extension of GCC if available */ -#if defined(__ATOMIC_SEQ_CST) +/* FIXME: Temporarily disabled on FreeBSD due to CI failures: + * https://gitlab.gnome.org/GNOME/glib/issues/1940 */ +#if defined(__ATOMIC_SEQ_CST) && !defined(__FreeBSD__) #define g_atomic_int_get(atomic) \ (G_GNUC_EXTENSION ({ \