diff options
| author | Haochen Tong <i@hexchain.org> | 2021-10-11 11:40:56 +0800 |
|---|---|---|
| committer | Cheng Shao <cheng.shao@tweag.io> | 2021-10-28 17:28:18 +0000 |
| commit | 0cc08e22d8aabb67caf4ad8a216de63fd31deb76 (patch) | |
| tree | 6c56e505677ecbde97d9f1930464fd23e831a5c3 | |
| parent | 238556a377f07d3f2abc289834f834c5c693118b (diff) | |
| download | haskell-0cc08e22d8aabb67caf4ad8a216de63fd31deb76.tar.gz | |
Check for libatomic dependency for atomic operations
Some platforms (e.g. RISC-V) require linking against libatomic for some
(e.g. sub-word-sized) atomic operations.
Fixes #19119.
(cherry picked from commit 90f06a0e015e18c066fe1569fb2add318bec72ca)
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | rts/package.conf.in | 3 | ||||
| -rw-r--r-- | rts/rts.cabal.in | 5 |
3 files changed, 34 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6eac557b93..53da517044 100644 --- a/configure.ac +++ b/configure.ac @@ -1230,6 +1230,32 @@ AC_LINK_IFELSE([ AC_MSG_RESULT(no) ) +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 + LIBS="-latomic" + 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_DEFINE_UNQUOTED([NEED_ATOMIC_LIB], [$need_latomic], + [Define to 1 if we need -latomic for sub-word atomic operations.]) + dnl ** check for eventfd which is needed by the I/O manager AC_CHECK_HEADERS([sys/eventfd.h]) AC_CHECK_FUNCS([eventfd]) diff --git a/rts/package.conf.in b/rts/package.conf.in index e7379045ed..b29512c2de 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -63,6 +63,9 @@ extra-libraries: , "elf" , "dw" /* for backtraces */ #endif +#if NEED_ATOMIC_LIB + , "atomic" +#endif #if defined(INSTALLING) include-dirs: INCLUDE_DIR FFI_INCLUDE_DIR diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index cebf6795f3..1d6860d872 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -18,6 +18,8 @@ flag libbfd default: @CabalHaveLibbfd@ flag mingwex default: @CabalMingwex@ +flag need-atomic + default: @CabalNeedLibatomic@ flag libdw default: @CabalHaveLibdw@ flag libnuma @@ -111,6 +113,9 @@ library if flag(need-pthread) -- for pthread_getthreadid_np, pthread_create, ... extra-libraries: pthread + if flag(need-atomic) + -- for sub-word-sized atomic operations (#19119) + extra-libraries: atomic if flag(libbfd) -- for debugging extra-libraries: bfd iberty |