From bed957bbaba16bd593ca43b3ab5621c6a0f3b3f1 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Sun, 10 Sep 2023 04:10:36 +0200
Subject: [PATCH] gh-109054: Don't use libatomic on cross-compilation

configure no longer uses libatomic by default when Python is
cross-compiled. The LIBATOMIC variable can be set manually in this
case:

    ./configure LIBATOMIC="-latomic" (...)
---
 configure    | 5 +----
 configure.ac | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index c78c45d11260f6e..d38c54f2d4af334 100755
--- a/configure
+++ b/configure
@@ -27774,7 +27774,7 @@ then :
 else $as_nop
   if test "$cross_compiling" = yes
 then :
-  ac_cv_libatomic_needed=yes
+  ac_cv_libatomic_needed=no
 else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27811,9 +27811,7 @@ int main()
 _ACEOF
 if ac_fn_c_try_run "$LINENO"
 then :
-
   ac_cv_libatomic_needed=no
-
 else $as_nop
   ac_cv_libatomic_needed=yes
 fi
@@ -27821,7 +27819,6 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libatomic_needed" >&5
 printf "%s\n" "$ac_cv_libatomic_needed" >&6; }
diff --git a/configure.ac b/configure.ac
index f833755a4660125..7df0342135dc2b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7007,9 +7007,10 @@ int main()
     }
     return 0; // all good
 }
-]])],[
-  ac_cv_libatomic_needed=no
-],[ac_cv_libatomic_needed=yes],[ac_cv_libatomic_needed=yes])
+]])],
+[ac_cv_libatomic_needed=no],  dnl build succeeded
+[ac_cv_libatomic_needed=yes], dnl build failed
+[ac_cv_libatomic_needed=no])  dnl cross compilatio
 ])
 
 AS_VAR_IF([ac_cv_libatomic_needed], [yes],