diff options
author | Sverker Eriksson <[email protected]> | 2018-07-05 12:25:33 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2018-07-05 12:25:33 +0200 |
commit | 2d7362c6e1c031a5cb68465fad613c5219956875 (patch) | |
tree | 375721410a7bf745852f8dc744ec6725e122760e | |
parent | 6bcb9b349db93834cec4cd763b103236b03d52d5 (diff) | |
parent | 8d5418b9b89b24ac04477b6141d440f5099f0f81 (diff) | |
download | otp-2d7362c6e1c031a5cb68465fad613c5219956875.tar.gz otp-2d7362c6e1c031a5cb68465fad613c5219956875.tar.bz2 otp-2d7362c6e1c031a5cb68465fad613c5219956875.zip |
Merge branch 'sverker/master/purge-vfork'
-rw-r--r-- | erts/configure.in | 23 | ||||
-rw-r--r-- | lib/runtime_tools/src/system_information.erl | 1 |
2 files changed, 0 insertions, 24 deletions
diff --git a/erts/configure.in b/erts/configure.in index 9e8ffd5ec5..2b3d97cfdd 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -2012,29 +2012,6 @@ esac AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>]) -disable_vfork=false -if test "x$EMU_THR_LIB_NAME" != "x"; then - AC_MSG_CHECKING([if vfork is known to hang multithreaded applications]) - case $host_os in - osf*) - AC_MSG_RESULT(yes) - disable_vfork=true;; - *) - AC_MSG_RESULT(no);; - esac -fi - -if test $disable_vfork = false; then - AC_FUNC_VFORK - if test $ac_cv_func_vfork_works = no; then - disable_vfork=true - fi -fi - -if test $disable_vfork = true; then - AC_DEFINE(DISABLE_VFORK, 1, [Define if you want to disable vfork.]) -fi - AC_FUNC_VPRINTF dnl The AC_DEFINEs are necessary for autoheader to work. :-( diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl index 136ee55b54..8f7bfa195b 100644 --- a/lib/runtime_tools/src/system_information.erl +++ b/lib/runtime_tools/src/system_information.erl @@ -400,7 +400,6 @@ os_getenv_erts_specific() -> "ERL_MALLOC_LIB", "ERL_MAX_PORTS", "ERL_MAX_ETS_TABLES", - "ERL_NO_VFORK", "ERL_NO_KERNEL_POLL", "ERL_THREAD_POOL_SIZE", "ERLC_EMULATOR", |