Skip to content

Fix C/C++ atomics conflict in compilation of the cpp_thread_tests #5941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martin-frbg merged 1 commit into from
Jul 23, 2026
+4 −4
Merged

Fix C/C++ atomics conflict in compilation of the cpp_thread_tests #5941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ extern "C" {
#endif

#ifndef ASSEMBLER
#ifdef HAVE_C11
#if defined(HAVE_C11) && !defined(__cplusplus)
#if defined(C_GCC) && ( __GNUC__ < 7)
// workaround for GCC bug 65467
#ifndef _Atomic
Expand Down Expand Up @@ -447,7 +447,7 @@ please https://github.com/xianyi/OpenBLAS/issues/246
#endif

#ifndef ASSEMBLER
#ifdef HAVE_C11
#if defined(HAVE_C11) && !defined(__cplusplus)
#define BLAS_LOCK_DEFINED
#endif
#endif
Expand Down Expand Up @@ -579,7 +579,7 @@ static __inline void blas_lock(volatile BLASULONG *address){
#define BLAS_LOCK_DEFINED
#endif

#ifdef HAVE_C11
#if defined(HAVE_C11) && !defined(__cplusplus)
static __inline void blas_lock(volatile BLASULONG *address) {
BLASULONG expected = 0;
while (!atomic_compare_exchange_strong((volatile _Atomic BLASULONG *)address,
Expand All @@ -591,7 +591,7 @@ static __inline void blas_lock(volatile BLASULONG *address) {
#endif

static __inline void blas_unlock(volatile BLASULONG *address){
#ifdef HAVE_C11
#if defined(HAVE_C11) && !defined(__cplusplus)
atomic_store((volatile _Atomic BLASULONG *)address, (BLASULONG)0);
#else
MB;
Expand Down
Loading