Skip to content

Commit 9045f8e

Browse files
threadpool: fix gcc builds : __has_feature needs to be in a separate ifdef
1 parent 2d9bb63 commit 9045f8e

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

ggml/src/ggml.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3204,12 +3204,14 @@ static void ggml_barrier(struct ggml_threadpool * threadpool) {
32043204
// to see an explicit acquire / release sequence to declare all futher accesses
32053205
// as safe.
32063206

3207-
#if defined(__has_feature) && __has_feature(thread_sanitizer)
3208-
#define passed_acquire memory_order_acquire
3209-
#define passed_release memory_order_release
3210-
#else
3211-
#define passed_acquire memory_order_relaxed
3212-
#define passed_release memory_order_relaxed
3207+
memory_order passed_acquire = memory_order_relaxed;
3208+
memory_order passed_release = memory_order_relaxed;
3209+
3210+
#if defined(__has_feature)
3211+
#if __has_feature(thread_sanitizer)
3212+
passed_acquire = memory_order_acquire;
3213+
passed_release = memory_order_release;
3214+
#endif
32133215
#endif
32143216

32153217
if (atomic_fetch_add_explicit(n_barrier, 1, memory_order_seq_cst) == n_threads - 1) {

0 commit comments

Comments
 (0)