sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #16059: configure: Fix thread_local detection

Browse Source 
480e3415d7 configure: Add flag for enabling thread_local. (Carl Dong)

Pull request description:

  - When aiming for glibc compatibility, don't use thread_local. Fixes #15958.
  - FreeBSD has a buggy thread_local, don't use it. Fixes #16055.

  I've done a Gitian build on my local machine and the symbol tests seem to pass.

ACKs for commit 480e34:
  MarcoFalke:
    utACK 480e3415d738a4e0e2ad9774c43f29937178ecae
  fanquake:
    tACK 480e341

Tree-SHA512: 334f21f7cf271c261b115a6410afd4ed4db3e84ad79b98c6c684c1dfa42b081f16d58e77695929e27b0fa173a894b959a327fe82821a3f3ed708b305a906ddd3
This commit is contained in:
MarcoFalke 2019-05-25 10:39:36 -04:00 committed by linuxsh2
parent 13b0efe1bd
commit 3c6ae97332
1 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure.ac
View File

@ -195,6 +195,12 @@ AC_ARG_ENABLE([glibc-back-compat],
[use_glibc_compat=$enableval], [use_glibc_compat=$enableval],
[use_glibc_compat=no]) [use_glibc_compat=no])
AC_ARG_ENABLE([threadlocal],
[AS_HELP_STRING([--enable-threadlocal],
[enable features that depend on the c++ thread_local keyword (currently just thread names in debug logs). (default is to enabled if there is platform support and glibc-back-compat is not enabled)])],
[use_thread_local=$enableval],
[use_thread_local=auto])
AC_ARG_ENABLE([asm], AC_ARG_ENABLE([asm],
[AS_HELP_STRING([--disable-asm], [AS_HELP_STRING([--disable-asm],
[disable assembly routines (enabled by default)])], [disable assembly routines (enabled by default)])],
@ -876,10 +882,11 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
] ]
) )
TEMP_LDFLAGS="$LDFLAGS" if test "x$use_thread_local" = xyes || { test "x$use_thread_local" = xauto && test "x$use_glibc_compat" = xno; }; then
LDFLAGS="$TEMP_LDFLAGS $PTHREAD_CFLAGS" TEMP_LDFLAGS="$LDFLAGS"
AC_MSG_CHECKING([for thread_local support]) LDFLAGS="$TEMP_LDFLAGS $PTHREAD_CFLAGS"
AC_LINK_IFELSE([AC_LANG_SOURCE([ AC_MSG_CHECKING([for thread_local support])
AC_LINK_IFELSE([AC_LANG_SOURCE([
#include <thread> #include <thread>
static thread_local int foo = 0; static thread_local int foo = 0;
static void run_thread() { foo++;} static void run_thread() { foo++;}
@ -901,6 +908,11 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
# supported (per https://stackoverflow.com/a/29929949) # supported (per https://stackoverflow.com/a/29929949)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
;; ;;
*freebsd*)
# FreeBSD's implementation of thread_local is also buggy (per
# https://groups.google.com/d/msg/bsdmailinglist/22ncTZAbDp4/Dii_pII5AwAJ)
AC_MSG_RESULT(no)
;;
*) *)
AC_DEFINE(HAVE_THREAD_LOCAL,1,[Define if thread_local is supported.]) AC_DEFINE(HAVE_THREAD_LOCAL,1,[Define if thread_local is supported.])
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -910,8 +922,9 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
[ [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
] ]
) )
LDFLAGS="$TEMP_LDFLAGS" LDFLAGS="$TEMP_LDFLAGS"
fi
dnl check for gmtime_r(), fallback to gmtime_s() if that is unavailable dnl check for gmtime_r(), fallback to gmtime_s() if that is unavailable
dnl fail if neither are available. dnl fail if neither are available.