aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2010-08-24 15:54:54 +0200
committerRickard Green <[email protected]>2010-08-24 15:54:54 +0200
commit6b6d93d8cb0af40b04890e1986b05ed793eacde2 (patch)
tree04b7d4421d6517fcedba5a17de7d1e1aaa66d8d0
parenta6742ca55398f6f9003977379faacd11c87906a0 (diff)
parent2b184e71e2df3cd900fb71b4ebb63015253ba240 (diff)
downloadotp-6b6d93d8cb0af40b04890e1986b05ed793eacde2.tar.gz
otp-6b6d93d8cb0af40b04890e1986b05ed793eacde2.tar.bz2
otp-6b6d93d8cb0af40b04890e1986b05ed793eacde2.zip
Merge branch 'rickard/nptl-configure/OTP-8774' into dev
* rickard/nptl-configure/OTP-8774: Removed unused define Fix propagation of nptl info
-rw-r--r--erts/aclocal.m44
-rw-r--r--erts/configure.in6
2 files changed, 6 insertions, 4 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 0fa3fec244..3b1edd7605 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -521,11 +521,13 @@ if test "X$host_os" = "Xwin32"; then
THR_DEFS="-DWIN32_THREADS"
THR_LIBS=
THR_LIB_NAME=win32_threads
+ THR_LIB_TYPE=win32_threads
else
AC_MSG_RESULT(no)
THR_DEFS=
THR_LIBS=
THR_LIB_NAME=
+ THR_LIB_TYPE=posix_unknown
dnl Try to find POSIX threads
@@ -586,6 +588,7 @@ dnl On ofs1 the '-pthread' switch should be used
AC_MSG_WARN([result yes guessed because of cross compilation])
fi
if test $nptl = yes; then
+ THR_LIB_TYPE=posix_nptl
need_nptl_incldir=no
AC_CHECK_HEADER(nptl/pthread.h,
[need_nptl_incldir=yes
@@ -694,6 +697,7 @@ ERL_INTERNAL_LIBS
ethr_have_native_atomics=no
ethr_have_native_spinlock=no
ETHR_THR_LIB_BASE="$THR_LIB_NAME"
+ETHR_THR_LIB_BASE_TYPE="$THR_LIB_TYPE"
ETHR_DEFS="$THR_DEFS"
ETHR_X_LIBS="$THR_LIBS $ERTS_INTERNAL_X_LIBS"
ETHR_LIBS=
diff --git a/erts/configure.in b/erts/configure.in
index d1404580fa..5d02fd1ee4 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1171,17 +1171,15 @@ else
enable_child_waiter_thread=yes
;;
linux*)
- AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX,[1],
- [Define if malloc should use a recursive mutex])
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
- if test "x$ETHR_THR_LIB_BASE_NAME" != "xnptl"; then
+ if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
[Define if dlopen() needs to be called before first call to dlerror()])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
- if test "x$ETHR_THR_LIB_BASE_NAME" != "xnptl"; then
+ if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
# Child waiter thread cannot be enabled
disable_child_waiter_thread=yes
enable_child_waiter_thread=no