From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Tue, 19 Sep 2023 23:00:36 +0000 (+0100)
Subject: Use libatomic for 64-bit operations
X-Git-Tag: archive/raspbian/9.4.7-2+rpi1~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=be567b9dbf9e52f0a289872ea052b36180a2b838;p=ghc.git

Use libatomic for 64-bit operations

The rts package uses GCC's __atomic built-in functions on 64-bit values. This
is not supported on some 32bit platforms (e.g., mipsel) resulting in the
following compilation error:
   rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_load_8'
   rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_store_8'
   rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_fetch_add_8'

 Fix this by linking against libatomic.
Author: Ilias Tsitsimpis <iliastsi@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/20549
Forwarded: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6820

Gbp-Pq: Name latomic-64bit
---

diff --git a/configure.ac b/configure.ac
index 2fe23d3b..6d014604 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1286,12 +1286,11 @@ AC_LINK_IFELSE([
   AC_MSG_RESULT(no)
 )
 
+need_latomic=0
 AC_MSG_CHECKING(whether -latomic is needed for sub-word-sized atomic operations)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
     [
         AC_MSG_RESULT(no)
-        AC_SUBST([CabalNeedLibatomic],[False])
-        need_latomic=0
     ],
     [
         _save_LIBS=$LIBS
@@ -1299,18 +1298,46 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1,
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
             [
                 AC_MSG_RESULT(yes)
-                AC_SUBST([CabalNeedLibatomic],[True])
                 need_latomic=1
             ],
             [
-                AC_SUBST([CabalNeedLibatomic],[False])
                 AC_MSG_ERROR([sub-word-sized atomic operations not available.])
-                need_latomic=0
             ])
         LIBS=$_save_LIBS
     ])
+AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic operations)
+AC_LINK_IFELSE([AC_LANG_PROGRAM(
+        [[
+        #include <inttypes.h>
+        uint64_t a;
+        ]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
+    [
+        AC_MSG_RESULT(no)
+    ],
+    [
+        _save_LIBS=$LIBS
+        LIBS="-latomic"
+        AC_LINK_IFELSE([AC_LANG_PROGRAM(
+                [[
+                #include <inttypes.h>
+                uint64_t a;
+                ]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
+            [
+                AC_MSG_RESULT(yes)
+                need_latomic=1
+            ],
+            [
+                AC_MSG_ERROR([64-bit atomic operations not available.])
+            ])
+        LIBS=$_save_LIBS
+    ])
+if test $need_latomic = 1; then
+    AC_SUBST([CabalNeedLibatomic],[True])
+else
+    AC_SUBST([CabalNeedLibatomic],[False])
+fi
 AC_DEFINE_UNQUOTED([NEED_ATOMIC_LIB], [$need_latomic],
-    [Define to 1 if we need -latomic for sub-word atomic operations.])
+    [Define to 1 if we need -latomic.])
 
 dnl ** check for eventfd which is needed by the I/O manager
 AC_CHECK_HEADERS([sys/eventfd.h])