Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 593 insertions, 390 deletions

diff --git a/erts/configure.in b/erts/configure.in
index b056ba44e2..81ecad4f51 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2,18 +2,19 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1997-2013. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2016. All Rights Reserved.
 dnl
-dnl The contents of this file are subject to the Erlang Public License,
-dnl Version 1.1, (the "License"); you may not use this file except in
-dnl compliance with the License. You should have received a copy of the
-dnl Erlang Public License along with this software. If not, it can be
-dnl retrieved online at http://www.erlang.org/.
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
 dnl
-dnl Software distributed under the License is distributed on an "AS IS"
-dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-dnl the License for the specific language governing rights and limitations
-dnl under the License.
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
 dnl
 dnl %CopyrightEnd%
 
@@ -61,9 +62,6 @@ if test x"${ERL_TOP}/erts" != x"$srcdir"; then
 fi
 erl_top=${ERL_TOP}
 
-# Remove old configuration information
-/bin/rm -f "$ERL_TOP/erts/CONF_INFO"
-
 # echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 # echo X
 # echo "X srcdir  = $srcdir"
@@ -105,7 +103,6 @@ AC_CONFIG_HEADER($host/config.h:config.h.in include/internal/$host/ethread_heade
 dnl ----------------------------------------------------------------------
 dnl Optional features.
 dnl ----------------------------------------------------------------------
-enable_child_waiter_thread=no
 ENABLE_ALLOC_TYPE_VARS=
 AC_SUBST(ENABLE_ALLOC_TYPE_VARS)
 
@@ -123,6 +120,7 @@ AS_HELP_STRING([--enable-bootstrap-only],
 	with_ssl_zlib=no
 	enable_hipe=no
 	enable_sctp=no
+        enable_dirty_schedulers=no
   fi	
 ])
 
@@ -134,13 +132,12 @@ AS_HELP_STRING([--disable-threads], [disable async thread support]),
     *)  enable_threads=yes ;;
   esac ], enable_threads=unknown)
 
-AC_ARG_ENABLE(halfword-emulator,
-AS_HELP_STRING([--enable-halfword-emulator],
-               [enable halfword emulator (only for 64bit builds)]),
+AC_ARG_ENABLE(dirty-schedulers,
+AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]),
 [ case "$enableval" in
-    no) enable_halfword_emualtor=no ;;
-    *)  enable_halfword_emulator=yes ;;
-  esac ], enable_halfword_emulator=unknown)
+    no) enable_dirty_schedulers=no ;;
+    *)  enable_dirty_schedulers=yes ;;
+  esac ], enable_dirty_schedulers=default)
 
 AC_ARG_ENABLE(smp-support,
 AS_HELP_STRING([--enable-smp-support], [enable smp support])
@@ -150,6 +147,14 @@ AS_HELP_STRING([--disable-smp-support], [disable smp support]),
     *)  enable_smp_support=yes ;;
   esac ], enable_smp_support=unknown)
 
+AC_ARG_ENABLE(smp-require-native-atomics,
+	      AS_HELP_STRING([--disable-smp-require-native-atomics],
+                             [disable the SMP requirement of a native atomic implementation]),
+[ case "$enableval" in
+    no) smp_require_native_atomics=no ;;
+    *)  smp_require_native_atomics=yes ;;
+  esac ], smp_require_native_atomics=yes)
+
 AC_ARG_WITH(termcap,
 AS_HELP_STRING([--with-termcap], [use termcap (default)])
 AS_HELP_STRING([--without-termcap],
@@ -198,9 +203,6 @@ AC_ARG_ENABLE(native-libs,
 AS_HELP_STRING([--enable-native-libs],
                [compile Erlang libraries to native code]))
 
-AC_ARG_ENABLE(tsp,
-AS_HELP_STRING([--enable-tsp], [compile tsp app]))
-
 AC_ARG_ENABLE(fp-exceptions,
 AS_HELP_STRING([--enable-fp-exceptions],
                [use hardware floating point exceptions (default if hipe enabled)]),
@@ -210,24 +212,6 @@ AS_HELP_STRING([--enable-fp-exceptions],
   esac
 ],enable_fp_exceptions=auto)
 
-AC_ARG_ENABLE(darwin-universal,
-AS_HELP_STRING([--enable-darwin-universal],
-               [build universal binaries on darwin i386]),
-[ case "$enableval" in
-    no) enable_darwin_universal=no ;;
-    *)  enable_darwin_univeral=yes ;;
-  esac
-],enable_darwin_universal=no)
-
-
-AC_ARG_ENABLE(darwin-64bit,
-AS_HELP_STRING([--enable-darwin-64bit], [build 64bit binaries on darwin]),
-[ case "$enableval" in
-    no) enable_darwin_64bit=no ;;
-    *)  enable_darwin_64bit=yes ;;
-  esac
-],enable_darwin_64bit=no)
-
 AC_ARG_ENABLE(m64-build,
 AS_HELP_STRING([--enable-m64-build],
                [build 64bit binaries using the -m64 flag to (g)cc]),
@@ -242,36 +226,13 @@ AS_HELP_STRING([--enable-m32-build],
                [build 32bit binaries using the -m32 flag to (g)cc]),
 [ case "$enableval" in
     no) enable_m32_build=no ;;
-    *)
-	if test X${enable_darwin_64bit} = Xyes -o  X${enable_m64_build} = Xyes;
-	then
-		AC_MSG_ERROR([(--enable-darwin-64bit or --enable-m64-build) and --enable-m32-build are mutually exclusive]) ;
-	fi ;
-	enable_m32_build=yes ;;
+    *)	enable_m32_build=yes ;;
   esac
 ],enable_m32_build=no)
 
-AC_SUBST(PERFCTR_PATH)
-AC_ARG_WITH(perfctr,
-AS_HELP_STRING([--with-perfctr=PATH],
-               [specify location of perfctr include and lib])
-AS_HELP_STRING([--without-perfctr], [don't use perfctr (default)]))
-
-if test "x$with_perfctr" = "xno" -o "x$with_perfctr" = "x" ; then
-    PERFCTR_PATH=
-else
-    if test ! -f "$with_perfctr/usr.lib/libperfctr.a" ; then
-	AC_MSG_ERROR(Invalid path to option --with-perfctr=PATH)
-    fi
-    PERFCTR_PATH="$with_perfctr"
-    AC_DEFINE(USE_PERFCTR,[1],
-              [Define to enable hrvtime() on Linux systems with perfctr extension])
-fi
-
-
 AC_ARG_WITH(dynamic-trace,
-AS_HELP_STRING([--with-dynamic-trace={dtrace|systemtap}],
-	       [specify use of dynamic trace framework, dtrace or systemtap])
+AS_HELP_STRING([--with-dynamic-trace={dtrace|lttng|systemtap}],
+	       [specify use of dynamic trace framework, dtrace, lttng or systemtap])
 AS_HELP_STRING([--without-dynamic-trace], 
                [don't enable any dynamic tracing (default)]))
 
@@ -281,6 +242,10 @@ fi
 
 case "$with_dynamic_trace" in
      no) DYNAMIC_TRACE_FRAMEWORK=;;
+     lttng)
+            AC_DEFINE(USE_LTTNG,[1],
+                      [Define if you want to use lttng for dynamic tracing])
+            DYNAMIC_TRACE_FRAMEWORK=lttng;;
      dtrace) 
 	    AC_DEFINE(USE_DTRACE,[1],
 		[Define if you want to use dtrace for dynamic tracing])
@@ -316,20 +281,61 @@ AS_HELP_STRING([--enable-vm-probes],
 			fi)
 
 AC_SUBST(USE_VM_PROBES)
-if test X"$use_vm_probes" = X"yes"; then
-   USE_VM_PROBES=yes
-   AC_DEFINE(USE_VM_PROBES,[1],
-	     [Define to enable VM dynamic trace probes])
+if test X"$DYNAMIC_TRACE_FRAMEWORK" != X"lttng"; then
+    if test X"$use_vm_probes" = X"yes"; then
+        USE_VM_PROBES=yes
+        AC_DEFINE(USE_VM_PROBES,[1],
+                  [Define to enable VM dynamic trace probes])
+    fi
 fi
 
+AC_ARG_WITH(assumed-cache-line-size,
+AS_HELP_STRING([--with-assumed-cache-line-size=SIZE],
+               [specify assumed cache line size in bytes (valid values are powers of two between and including 16 and 8192; default is 64)]))
 
-AC_ARG_ENABLE(clock-gettime,
-AS_HELP_STRING([--enable-clock-gettime],
-               [use clock-gettime for time correction]),
+dnl Require the assumed cache-line size to be a power of two between 16 and 8192
+case "$with_assumed_cache_line_size" in
+     ""|no|yes)
+	with_assumed_cache_line_size=64;;
+     16|32|64|128|256|512|1024|2048|4096|8192)
+	;;
+     *)
+	AC_MSG_ERROR([Invalid assumed cache-line size of $with_assumed_cache_line_size bytes])
+	;;
+esac
+
+AC_DEFINE_UNQUOTED(ASSUMED_CACHE_LINE_SIZE,
+		   $with_assumed_cache_line_size,
+		   [Assumed cache-line size (in bytes)])
+
+AC_ARG_ENABLE(systemd,
+AS_HELP_STRING([--enable-systemd], [enable systemd support in epmd]),
+[],
+[enable_systemd=no])
+
+AC_ARG_ENABLE(saved-compile-time,
+AS_HELP_STRING([--disable-saved-compile-time], [disable saved compile time]),
 [ case "$enableval" in
-    no) clock_gettime_correction=no ;;
-    *) clock_gettime_correction=yes ;;
-  esac ], clock_gettime_correction=unknown)
+    no) save_compile_time=0 ;;
+    *)  save_compile_time=1 ;;
+  esac ], save_compile_time=1)
+
+AC_DEFINE_UNQUOTED(ERTS_SAVED_COMPILE_TIME, $save_compile_time, [Save compile time?])
+
+AC_ARG_WITH(microstate-accounting,
+AS_HELP_STRING([--with-microstate-accounting={yes|extra}],
+               [enable microstate account, possibly with extra detailed states])
+AS_HELP_STRING([--without-microstate-accounting],
+               [don't enable microstate accounting]),
+[],[with_microstate_accounting=yes])
+
+case "$with_microstate_accounting" in
+    yes) AC_DEFINE(ERTS_ENABLE_MSACC,[1],
+		[Define as 1 if you want to enable microstate accounting, 2 if you want extra states]) ;;
+    extra) AC_DEFINE(ERTS_ENABLE_MSACC,[2],
+		[Define as 1 if you want to enable microstate accounting, 2 if you want extra states]) ;;
+    *) ;;
+esac
 
 dnl Magic test for clearcase.
 OTP_RELEASE=
@@ -341,42 +347,17 @@ else
 fi
 AC_SUBST(OTP_RELEASE)
 
-dnl OK, we might have darwin switches off different kinds, lets 
-dnl check it all before continuing.
-TMPSYS=`uname -s`-`uname -m`
-if test X${enable_darwin_universal} = Xyes; then
-	if test X${enable_darwin_64bit} = Xyes; then
-		AC_MSG_ERROR([--enable-darwin-universal and --enable-darwin-64bit mutually exclusive])
-	fi
-	enable_hipe=no
-	case $CFLAGS in
-		*-arch\ ppc*)
-			;;
-		*)
-			CFLAGS="-arch ppc $CFLAGS"
-			;;
-	esac
-	case $CFLAGS in
-		*-arch\ i386*)
-			;;
-		*)
-			CFLAGS="-arch i386 $CFLAGS"
-			;;
-	esac
-fi
-if test X${enable_darwin_64bit} = Xyes; then
-	case "$TMPSYS" in
-	    Darwin-i386|Darwin-x86_64)
-		;;
-	    Darwin*)
-		AC_MSG_ERROR([--enable-darwin-64bit only supported on x86 hosts])
-		;;
-	    *)
-		AC_MSG_ERROR([--enable-darwin-64bit only supported on Darwin])
-		;;
-	esac
-fi
-if test X${enable_darwin_64bit} = Xyes -o X${enable_m64_build} = Xyes; then
+AC_MSG_CHECKING([OTP release])
+[SYSTEM_VSN=`cat $ERL_TOP/OTP_VERSION | sed "s|\([0-9]*\).*|\1|"`]
+AC_MSG_RESULT([$SYSTEM_VSN])
+AC_SUBST(SYSTEM_VSN)
+
+AC_MSG_CHECKING([OTP version])
+[OTP_VERSION=`cat $ERL_TOP/OTP_VERSION`]
+AC_MSG_RESULT([$OTP_VERSION])
+AC_SUBST(OTP_VERSION)
+
+if test X${enable_m64_build} = Xyes; then
 	case $CFLAGS in
 		*-m64*)
 			;;
@@ -385,32 +366,41 @@ if test X${enable_darwin_64bit} = Xyes -o X${enable_m64_build} = Xyes; then
 			;;
 	esac
 else
-	case $host_os in
-		darwin*)
-			case $CFLAGS in
-			*-m32*)
-				;;
-			*)
-				CFLAGS="-m32 $CFLAGS"
-				;;
-			esac
-			;;
-		*)
-			if test X${enable_m32_build} = Xyes;
-			then
-				enable_hipe=no;
-				case $CFLAGS in
-				*-m32*)
-					;;
-				*)
-					CFLAGS="-m32 $CFLAGS"
-				;;
-				esac ;
-			fi
-			;;
-	esac
+	if test X${enable_m32_build} = Xyes;
+	then
+		enable_hipe=no;
+		case $CFLAGS in
+		    *-m32*)
+			    ;;
+		    *)
+			    CFLAGS="-m32 $CFLAGS"
+			    ;;
+		esac ;
+	fi
 fi
 
+AC_ARG_ENABLE(static-nifs,
+AS_HELP_STRING([--enable-static-nifs], [link nifs statically. If yes then all nifs in all Erlang/OTP applications will be statically linked into the main binary. It is also possible to give a list of nifs that should be linked statically. The list should be a comma separated and contain the absolute path to a .a archive for each nif that is to be statically linked. The name of the .a archive has to be the same as the name of the nif. Note that you have to link any external dependencies that the nifs have to the main binary, so for the crypto nif you want to pass LIBS=-lcrypto to configure.]),
+	       STATIC_NIFS="$enableval",
+	       STATIC_NIFS=no)
+AC_SUBST(STATIC_NIFS)
+
+AC_ARG_ENABLE(static-drivers,
+AS_HELP_STRING([--enable-static-drivers], [comma separated list of linked-in drivers to link statically with the main binary. The list should contain the absolute path to a .a archive for each driver that is to be statically linked. The name of the .a archive has to be the same as the name of the driver.]),
+	       STATIC_DRIVERS="$enableval",
+	       STATIC_DRIVERS=no)
+AC_SUBST(STATIC_DRIVERS)
+
+AC_ARG_WITH(ets-write-concurrency-locks,
+AS_HELP_STRING([--with-ets-write-concurrency-locks={8|16|32|64|128|256}],
+               [specify how many locks the write_concurrency option for ets should use.])
+AS_HELP_STRING([--without-ets-write-concurrency-locks],
+               [use the default number of write_concurrency locks (default)]))
+
+if test X"$with_ets_write_concurrency_locks" != X""; then
+   AC_DEFINE_UNQUOTED(ERTS_DB_HASH_LOCK_CNT,$with_ets_write_concurrency_locks,
+		      [Define to override the default number of write_concurrency locks])
+fi
 
 dnl ----------------------------------------------------------------------
 dnl Checks for programs.
@@ -429,11 +419,8 @@ case $host_os in
     win32)
 	# The ethread library requires _WIN32_WINNT of at least 0x0403.
 	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501 -DWINVER=0x0501"
+	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
 	;;
-    darwin*)
-        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE"
-        ;;
     *)
 	;;
 esac
@@ -449,7 +436,7 @@ dnl
 
 extra_flags="-I${ERL_TOP}/erts/$host $OTP_EXTRA_FLAGS"
 CFLAGS="$CFLAGS $extra_flags"
-DEBUG_CFLAGS="-g $CPPFLAGS $extra_flags"
+DEBUG_CFLAGS="-g $CPPFLAGS $extra_flags $DEBUG_CFLAGS"
 DEBUG_FLAGS=-g
 
 dnl
@@ -539,6 +526,7 @@ fi
 if test "x$GCC" = xyes; then
   # Treat certain GCC warnings as errors
   LM_TRY_ENABLE_CFLAG([-Werror=return-type], [WERRORFLAGS])
+  LM_TRY_ENABLE_CFLAG([-Werror=implicit], [WERRORFLAGS])
 
   # until the emulator can handle this, I suggest we turn it off!
   #WFLAGS="-Wall -Wshadow -Wcast-qual -Wmissing-declarations"
@@ -593,7 +581,7 @@ fi
 case $chk_opsys_ in
     win32)			OPSYS=win32;;
     solaris2.*|SunOS5.*)	OPSYS=sol2;;
-    linux|Linux)		OPSYS=linux;;
+    linux*|Linux)		OPSYS=linux;;
     darwin|Darwin)		OPSYS=darwin;;
     freebsd|FreeBSD)		OPSYS=freebsd;;
     *)				OPSYS=noopsys
@@ -617,15 +605,19 @@ case $chk_arch_ in
     x86_64)	ARCH=amd64;;
     amd64)	ARCH=amd64;;
     macppc)	ARCH=ppc;;
+    powerpc)	ARCH=ppc;;
     ppc)	ARCH=ppc;;
     ppc64)	ARCH=ppc64;;
+    ppc64le)	ARCH=ppc64;;
     "Power Macintosh")	ARCH=ppc;;
     armv5b)	ARCH=arm;;
     armv5teb)	ARCH=arm;;
     armv5tel)	ARCH=arm;;
     armv5tejl)	ARCH=arm;;
-    armv6l) ARCH=arm;;
+    armv6l)	ARCH=arm;;
+    armv6hl)	ARCH=arm;;
     armv7l)	ARCH=arm;;
+    armv7hl)	ARCH=arm;;
     tile)	ARCH=tile;;
     *)	 	ARCH=noarch;;
 esac
@@ -688,32 +680,13 @@ case $ARCH-$OPSYS in
 		esac
 		;;
 	*-darwin*)
-		if test X${enable_darwin_universal} = Xyes; then
-			AC_MSG_NOTICE([Adjusting LDFLAGS for universal binaries])
-			
-			case $LDFLAGS in
-				*-arch\ ppc*)
-					;;
-				*)
-					LDFLAGS="-arch ppc $LDFLAGS"
-					;;
-			esac
-			case $LDFLAGS in
-				*-arch\ i386*)
-					;;
-				*)
-					LDFLAGS="-arch i386 $LDFLAGS"
-					;;
-			esac
-		else
-			case $LDFLAGS in
-				*-m32*)
-					;;
-				*)
-					LDFLAGS="-m32 $LDFLAGS"
-					;;
-			esac
-		fi
+		case $LDFLAGS in
+			*-m32*)
+				;;
+			*)
+				LDFLAGS="-m32 $LDFLAGS"
+				;;
+		esac
 		;;
 	*)
 		if test X${enable_m64_build} = Xyes; then
@@ -753,25 +726,36 @@ esac
 	
 AC_SUBST(LIBCARBON)
 
-dnl Check if we should/can build a halfword emulator
+_search_path=/bin:/usr/bin:/usr/local/bin:$PATH
 
-AC_MSG_CHECKING(if we are building a halfword emulator (32bit heap on 64bit machine))
-if test "$enable_halfword_emulator" = "yes"; then
-	if test "$ARCH" = "amd64"; then
-		AC_DEFINE(HALFWORD_HEAP_EMULATOR, [1],
-			  [Define if building a halfword-heap 64bit emulator])
-		ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS halfword"
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_ERROR(no; halfword emulator not supported on this architecture)
-	fi
-else
-	AC_MSG_RESULT([no])
+AC_PATH_PROG(RM, rm, false, $_search_path)
+if test "$ac_cv_path_RM" = false; then
+  AC_MSG_ERROR([No 'rm' command found])
 fi
 
+AC_PATH_PROG(MKDIR, mkdir, false, $_search_path)
+if test "$ac_cv_path_MKDIR" = false; then
+  AC_MSG_ERROR([No 'mkdir' command found])
+fi
 
+_search_path=
 
 
+# Remove old configuration information.
+# Next line should be placed after AC_PATH_PROG(RM, ...), but before
+# first output to CONN_INFO. So this is just the right place.
+$RM -f "$ERL_TOP/erts/CONF_INFO"
+
+dnl Check if we should/can build a sharing-preserving emulator
+AC_MSG_CHECKING(if we are building a sharing-preserving emulator)
+if test "$enable_sharing_preserving" = "yes"; then
+        AC_DEFINE(SHCOPY, [1],
+		  [Define if building a sharing-preserving emulator])
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+fi
+
 
 dnl some tests below will call this if we haven't already - and autoconf
 dnl can't handle those tests being done conditionally at runtime
@@ -792,27 +776,13 @@ if test "$ac_cv_prog_AR" = false; then
   AC_MSG_ERROR([No 'ar' command found in PATH])
 fi
 
-_search_path=/bin:/usr/bin:/usr/local/bin:$PATH
-
-AC_PATH_PROG(RM, rm, false, $_search_path)
-if test "$ac_cv_path_RM" = false; then
-  AC_MSG_ERROR([No 'rm' command found])
-fi
-
-AC_PATH_PROG(MKDIR, mkdir, false, $_search_path)
-if test "$ac_cv_path_MKDIR" = false; then
-  AC_MSG_ERROR([No 'mkdir' command found])
-fi
-
-_search_path=
-
 #
 # Get programs needed for building the documentation 
 #
 
 ## Delete previous failed configure results
 if test -f doc/CONF_INFO; then
-   rm doc/CONF_INFO
+   $RM doc/CONF_INFO
 fi
 
 AC_CHECK_PROGS(XSLTPROC, xsltproc)
@@ -902,12 +872,13 @@ dnl AC_CYGWIN is deprecated
 AC_EXEEXT
 AC_OBJEXT
 
-dnl This is the os flavour, should be unix, vxworks or win32
-if test "X$host" = "Xwin32"; then
-	ERLANG_OSTYPE=win32
-else
-	ERLANG_OSTYPE=unix         
-fi
+dnl This is the os flavour, should be unix, ose, vxworks or win32
+case $host in
+   win32)
+      ERLANG_OSTYPE=win32 ;;
+   *)
+      ERLANG_OSTYPE=unix ;;
+esac
 
 AC_SUBST(ERLANG_OSTYPE)
 
@@ -1035,6 +1006,23 @@ case $ERTS_BUILD_SMP_EMU in
 	;;
 esac
 
+AC_MSG_CHECKING(whether dirty schedulers should be enabled)
+case $ERTS_BUILD_SMP_EMU-$enable_dirty_schedulers in
+     yes-yes)
+	DIRTY_SCHEDULER_SUPPORT=yes;;
+     yes-default)
+	## Maybe yes for OTP 19...
+	DIRTY_SCHEDULER_SUPPORT=no;;
+     no-default)
+	DIRTY_SCHEDULER_SUPPORT=no;;
+     no-yes)
+	AC_MSG_ERROR([No smp emulator will be built, but dirty schedulers requested]);;
+     *)
+	DIRTY_SCHEDULER_SUPPORT=no;;
+esac
+AC_MSG_RESULT($DIRTY_SCHEDULER_SUPPORT)
+AC_SUBST(DIRTY_SCHEDULER_SUPPORT)
+
 if test $ERTS_BUILD_SMP_EMU = yes; then
 
 	if test $found_threads = no; then
@@ -1043,11 +1031,39 @@ if test $ERTS_BUILD_SMP_EMU = yes; then
 
 	AC_DEFINE(ERTS_HAVE_SMP_EMU, 1, [Define if the smp emulator is built])
 
-	case "$ethr_have_native_atomics-$ethr_have_native_spinlock" in
+	test "X$smp_require_native_atomics" = "Xyes" &&
+	     AC_DEFINE(ETHR_SMP_REQUIRE_NATIVE_IMPLS, 1, [Define if you want to enable check for native ethread implementations])
+
+	case "$ethr_have_native_atomics-$smp_require_native_atomics-$ethr_have_native_spinlock" in
 	  yes-*)
+		if test "$ethr_native_atomic_implementation" = "gcc_sync"; then
+		    test -f "$ERL_TOP/erts/CONF_INFO" ||
+			echo "" > "$ERL_TOP/erts/CONF_INFO"
+		    cat >> $ERL_TOP/erts/CONF_INFO <<EOF
+
+                 WARNING:
+                   Only gcc's __sync_* builtins available for
+                   atomic memory access. This will cause lots
+                   of expensive and unnecessary memory barrier
+                   instructions to be issued which will make
+                   the performance of the runtime system
+                   suffer. You are *strongly* advised to
+                   upgrade to a gcc version that supports the
+                   __atomic_* builtins (at least gcc version
+                   4.7) or build with libatomic_ops. See the
+                   "Atomic Memory Operations and the VM"
+		   chapter of \$ERL_TOP/HOWTO/INSTALL.md for
+                   more information.
+
+EOF
+		fi
+		;;
+
+	  no-yes-*)
+		AC_MSG_ERROR([No native atomic implementation found. See the \"Atomic Memory Operations and the VM\" chapter of \$ERL_TOP/HOWTO/INSTALL.md for more information.])
 		;;
 
-	  no-yes)
+	  no-no-yes)
 
 		test -f "$ERL_TOP/erts/CONF_INFO" ||
 		    echo "" > "$ERL_TOP/erts/CONF_INFO"
@@ -1056,12 +1072,13 @@ if test $ERTS_BUILD_SMP_EMU = yes; then
                  No native atomic implementation available.
                  Fallbacks implemented using spinlocks will be
                  used. Note that the performance of the SMP
-                 runtime system will suffer due to this.
+                 runtime system will suffer immensely due to
+		 this.
 
 EOF
 		;;
 
-	  no-no)
+	  no-no-no)
 
 		test -f "$ERL_TOP/erts/CONF_INFO" ||
 		    echo "" > "$ERL_TOP/erts/CONF_INFO"
@@ -1071,7 +1088,7 @@ EOF
                  spinlock implementation available. Fallbacks
                  implemented using mutexes will be used. Note
                  that the performance of the SMP runtime system
-                 will suffer much due to this.
+                 will suffer immensely due to this.
 
 EOF
 		;;
@@ -1083,7 +1100,7 @@ fi
 
 AC_SUBST(ERTS_BUILD_SMP_EMU)
 
-AC_CHECK_FUNCS([posix_fadvise])
+AC_CHECK_FUNCS([posix_fadvise closefrom])
 AC_CHECK_HEADERS([linux/falloc.h])
 dnl * Old glibcs have broken fallocate64(). Make sure not to use it.
 AC_CACHE_CHECK([whether fallocate() works],i_cv_fallocate_works,[
@@ -1226,12 +1243,8 @@ else
 	if test "x$enable_lock_count" != "xno"; then
 	    EMU_THR_DEFS="$EMU_THR_DEFS -DERTS_ENABLE_LOCK_COUNT"
 	fi
-	
-	disable_child_waiter_thread=no
+
 	case $host_os in
-	    solaris*)
-		enable_child_waiter_thread=yes
-		;;
 	    linux*)
 		AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
 		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
@@ -1241,16 +1254,6 @@ else
 		else
 			AC_MSG_RESULT(no)
 		fi
-		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
-		fi
-		;;
-	    win32)
-		# Child waiter thread cannot be enabled
-		disable_child_waiter_thread=yes
-		enable_child_waiter_thread=no
 		;;
 	    *)
 		;;
@@ -1270,24 +1273,6 @@ else
 	    esac
 	done
 	EMU_THR_DEFS=$new_emu_thr_defs
-
-	AC_MSG_CHECKING(whether the child waiter thread should be enabled)
-	if test $enable_child_waiter_thread = yes; then
-	    AC_DEFINE(ENABLE_CHILD_WAITER_THREAD,[1],
-		[Define if you want to enable child waiter thread])
-	    AC_MSG_RESULT(yes)
-	else
-	    case $ERTS_BUILD_SMP_EMU-$disable_child_waiter_thread in
-		yes-no)
-		    AC_MSG_RESULT([yes on SMP build, but not on non-SMP build]);;
-		*-yes)
-	    	    AC_DEFINE(DISABLE_CHILD_WAITER_THREAD,[1],
-			[Define if you want to disable child waiter thread])
-		    AC_MSG_RESULT(no);;
-		*)
-		    AC_MSG_RESULT(no);;
-	    esac
-	fi
 fi
 
 AC_SUBST(EMU_THR_LIB_NAME)
@@ -1322,7 +1307,7 @@ TERMCAP_LIB=
 if test "x$with_termcap" != "xno" &&
    test "X$host" != "Xwin32"; then
     # try these libs
-    termcap_libs="ncurses curses termcap termlib"
+    termcap_libs="tinfo ncurses curses termcap termlib"
 
     for termcap_lib in $termcap_libs; do
 	AC_CHECK_LIB($termcap_lib, tgetent, TERMCAP_LIB="-l$termcap_lib")
@@ -1358,24 +1343,44 @@ dnl -------------
 dnl zlib
 dnl -------------
 
-AC_ARG_ENABLE(shared-zlib,
-AS_HELP_STRING([--enable-shared-zlib], [enable using shared zlib library]),
-[ case "$enableval" in
-    no) enable_shared_zlib=no ;;
-    *)  enable_shared_zlib=yes ;;
-  esac ], enable_shared_zlib=no)
+AC_ARG_ENABLE(builtin-zlib,
+  AS_HELP_STRING([--enable-builtin-zlib],
+                 [force use of our own built-in zlib]),
+  [ case "$enableval" in
+      no) enable_builtin_zlib=no ;;
+      *)  enable_builtin_zlib=yes ;;
+    esac ], enable_builtin_zlib=no)
 
 Z_LIB=
 
-if test "x$enable_shared_zlib" = "xyes" ; then
-	AC_CHECK_LIB(z, adler32_combine,
-		[Z_LIB="-lz"
-		 AC_DEFINE(HAVE_LIBZ, 1, [Define to 1 if you have the `z' library (-lz).])],
-		[AC_MSG_ERROR([cannot find any shared zlib])])
+if test "x$enable_builtin_zlib" = "xyes"; then
+  AC_MSG_NOTICE([Using our own built-in zlib source])
 else
-	AC_MSG_NOTICE([Using own zlib source])
+AC_MSG_CHECKING(for zlib 1.2.5 or higher)
+zlib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[
+#include "zlib.h"
+]],[[
+#if ZLIB_VERNUM >= 0x1250
+  Bytef s[1];
+  s[0] = 0;
+  (void) adler32((uLong)0, s, 1);
+#else
+#error "No zlib 1.2.5 or higher found"
+error
+#endif
+]])],
+[
+ Z_LIB="-lz"
+ AC_DEFINE(HAVE_LIBZ, 1, [Define to 1 if you have the `z' library (-lz).])
+ AC_MSG_RESULT(yes)
+],[
+ AC_MSG_RESULT(no)
+])
+LIBS=$zlib_save_LIBS
 fi
-
 AC_SUBST(Z_LIB)
 
 dnl
@@ -1399,19 +1404,27 @@ dnl
 #	   if -lsocket doesn't work by itself.
 #--------------------------------------------------------------------
 
+tk_oldLibs=$LIBS
 erl_checkBoth=0
+SOCKET_LIBS=""
 AC_CHECK_FUNC(connect, erl_checkSocket=0, erl_checkSocket=1)
 if test "$erl_checkSocket" = 1; then
-    AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", erl_checkBoth=1)
+    AC_CHECK_LIB(socket, main, SOCKET_LIBS="-lsocket", erl_checkBoth=1)
 fi
+
 if test "$erl_checkBoth" = 1; then
-    tk_oldLibs=$LIBS
     LIBS="$LIBS -lsocket -lnsl"
-    AC_CHECK_FUNC(accept, erl_checkNsl=0, [LIBS=$tk_oldLibs])
+    AC_CHECK_FUNC(accept, SOCKET_LIBS="-lsocket -lnsl")
 fi
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
+
+LIBS="$tk_oldLibs $SOCKET_LIBS"
+AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [SOCKET_LIBS="$SOCKET_LIBS -lnsl"]))
 AC_CHECK_FUNC(gethostbyname_r,have_gethostbyname_r=yes)
 
+LIBS="$tk_oldLibs $SOCKET_LIBS"
+
+AC_SUBST(SOCKET_LIBS)
+
 dnl
 dnl These gethostbyname thingies use old style AC_DEFINE for BC with ancient 
 dnl autoconf...
@@ -1433,10 +1446,11 @@ if test "$have_gethostbyname_r" = yes; then
 				    [Define to flavour of gethostbyname_r]))
 		;;
 		*)
-			AC_EGREP_CPP(yes,[#include <stdio.h>
-			  #ifdef __GLIBC__
-			  yes
-			  #endif
+			AC_EGREP_CPP(^yes$,[
+#include <stdio.h>
+#ifdef __GLIBC__
+yes
+#endif
 			  ], AC_DEFINE(HAVE_GETHOSTBYNAME_R, GHBN_R_GLIBC,
 				[Define to flavour of gethostbyname_r]))
 		;;
@@ -1538,7 +1552,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h unistd.h syslog.h dlfcn.h ieeefp.h \
                  sys/ioctl.h sys/time.h sys/uio.h \
                  sys/socket.h sys/sockio.h sys/socketio.h \
                  net/errno.h malloc.h arpa/nameser.h libdlpi.h \
-		 pty.h util.h utmp.h langinfo.h poll.h sdkddkver.h)
+		 pty.h util.h libutil.h utmp.h langinfo.h poll.h sdkddkver.h)
 
 AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr], [], [],
 	[#ifdef __WIN32__
@@ -1561,6 +1575,33 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_enaddr], [], [],
 	])
 
 dnl ----------------------------------------------------------------------
+dnl  Check the availability of systemd
+dnl ----------------------------------------------------------------------
+if test x"$enable_systemd" != x"no"; then
+
+systemd_daemon_save_LIBS=$LIBS
+LIBS=
+AC_SEARCH_LIBS(sd_listen_fds,[systemd systemd-daemon],
+  [have_sd_listen_fds=yes],[have_sd_listen_fds=no],$systemd_daemon_save_LIBS)
+AC_SEARCH_LIBS(sd_notify,[systemd systemd-daemon],
+  [have_sd_notify=yes],[have_sd_notify=no],$systemd_daemon_save_LIBS)
+AC_CHECK_HEADERS(systemd/sd-daemon.h,
+  [have_systemd_sd_daemon_h=yes],[have_systemd_sd_daemon_h=no])
+
+if test x"$have_sd_listen_fds" = x"yes" && \
+   test x"$have_sd_notify" = x"yes" && \
+   test x"$have_systemd_sd_daemon_h" = x"yes"; then
+  AC_DEFINE([HAVE_SYSTEMD_DAEMON],[1],[Define if you have systemd daemon])
+  SYSTEMD_DAEMON_LIBS=$LIBS
+elif test x"$enable_systemd" = x"yes"; then
+  AC_MSG_FAILURE([--enable-systemd was given, but test for systemd failed])
+fi
+LIBS=$systemd_daemon_save_LIBS
+fi
+AC_SUBST(SYSTEMD_DAEMON_LIBS)
+
+
+dnl ----------------------------------------------------------------------
 dnl Check the availability for libdlpi
 dnl ----------------------------------------------------------------------
 AC_CHECK_LIB(dlpi, dlpi_open)
@@ -1616,6 +1657,10 @@ AC_CHECK_HEADER(sys/event.h, have_kernel_poll=kqueue)
 AC_CHECK_HEADER(sys/epoll.h, have_kernel_poll=epoll)
 AC_CHECK_HEADER(sys/devpoll.h, have_kernel_poll=/dev/poll)
 
+dnl Check if we have timerfds to be used for high accuracy
+dnl epoll_wait timeouts
+AC_CHECK_HEADERS([sys/timerfd.h])
+
 dnl Check for kernel SCTP support
 AC_SUBST(LIBSCTP)
 if test "x$enable_sctp" != "xno" ; then
@@ -1631,11 +1676,11 @@ if test "x$enable_sctp" != "xno" ; then
 fi
 
 if test x"$ac_cv_header_netinet_sctp_h" = x"yes"; then
-    AC_CHECK_FUNCS([sctp_bindx sctp_peeloff])
+    AC_CHECK_FUNCS([sctp_bindx sctp_peeloff sctp_getladdrs sctp_freeladdrs sctp_getpaddrs sctp_freepaddrs])
     AC_CHECK_DECLS([SCTP_UNORDERED, SCTP_ADDR_OVER, SCTP_ABORT,
                     SCTP_EOF, SCTP_SENDALL, SCTP_ADDR_CONFIRMED,
 		    SCTP_DELAYED_ACK_TIME,
-		    SCTP_EMPTY,
+		    SCTP_EMPTY, SCTP_UNCONFIRMED,
 		    SCTP_CLOSED, SCTPS_IDLE,
 		    SCTP_BOUND, SCTPS_BOUND,
 		    SCTP_LISTEN, SCTPS_LISTEN,
@@ -1663,6 +1708,10 @@ if test x"$ac_cv_header_netinet_sctp_h" = x"yes"; then
         ])
 fi
 
+dnl Check for setns
+AC_CHECK_HEADERS(sched.h setns.h)
+AC_CHECK_FUNCS([setns])
+
 HAVE_VALGRIND=no
 AC_CHECK_HEADER(valgrind/valgrind.h, HAVE_VALGRIND=yes)
 AC_SUBST(HAVE_VALGRIND)
@@ -1954,10 +2003,52 @@ AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
 
 AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
 		pread pwrite memmove strerror strerror_r strncasecmp \
-		gethrtime localtime_r gmtime_r inet_pton mmap mremap memcpy mallopt \
-		sbrk _sbrk __sbrk brk _brk __brk \
+		gethrtime localtime_r gmtime_r inet_pton \
+		mmap mremap memcpy mallopt sbrk _sbrk __sbrk brk _brk __brk \
 		flockfile fstat strlcpy strlcat setsid posix2time time2posix \
-		setlocale nl_langinfo poll])
+		setlocale nl_langinfo poll mlockall ppoll])
+
+AC_MSG_CHECKING([for isfinite])
+AC_TRY_LINK([#include <math.h>],
+            [isfinite(0);], have_isfinite=yes, have_isfinite=no),
+
+if test $have_isfinite = yes; then
+    AC_DEFINE(HAVE_ISFINITE,[1],
+              [Define to 1 if you have the `isfinite' function.])
+    AC_MSG_RESULT(yes)
+else
+    AC_MSG_RESULT(no)
+fi
+
+case X$erl_xcomp_posix_memalign in
+     Xno) ;;
+     Xyes) have_posix_memalign=yes ;;
+     *)
+	AC_CHECK_FUNC(
+		[posix_memalign],
+                [if test "$cross_compiling" != yes; then
+AC_TRY_RUN([
+#include <stdlib.h>
+int main(void) {
+    void *ptr = NULL;
+    int error;
+    size_t alignment = 0x40000, size = 0x20028;
+    if ((error = posix_memalign(&ptr, alignment, size)) != 0 || ptr == NULL)
+      return error;
+    return 0;
+}
+],have_posix_memalign=yes
+)
+		 else
+			have_posix_memalign=yes
+		 fi]);;
+esac
+
+if test $have_posix_memalign = yes; then
+   AC_DEFINE(HAVE_POSIX_MEMALIGN,[1],
+	     [Define to 1 if you have the `posix_memalign' function.])
+fi
+
 
 dnl writev on OS X snow leopard is broken for files > 4GB
 case $host_os in
@@ -2025,7 +2116,7 @@ fi
 dnl Need by run_erl.
 AC_CHECK_FUNCS([openpty])
 
-AC_CHECK_HEADERS(net/if_dl.h ifaddrs.h netpacket/packet.h)
+AC_CHECK_HEADERS(net/if_dl.h ifaddrs.h netpacket/packet.h sys/un.h)
 AC_CHECK_FUNCS([getifaddrs])
 
 dnl Checks for variables in6addr_any and in6addr_loopback,
@@ -2616,17 +2707,26 @@ LM_SYS_IPV6
 LM_SYS_MULTICAST
 ERL_TIME_CORRECTION
 AC_CHECK_PROG(M4, m4, m4)
+
+
+dnl HiPE cannot run on 64-bit without MAP_FIXED and MAP_NORESERVE
+if test X${enable_hipe} != Xno && test X$ac_cv_sizeof_void_p != X4; then
+   AC_CHECK_DECLS([MAP_FIXED, MAP_NORESERVE], [], [], [#include <sys/mman.h>])
+   if test X$ac_cv_have_decl_MAP_FIXED != Xyes || test X$ac_cv_have_decl_MAP_NORESERVE != Xyes; then
+      if test X${enable_hipe} = Xyes; then
+	 AC_MSG_ERROR([HiPE on 64-bit needs MAP_FIXED and MAP_NORESERVE flags for mmap()])
+      else
+	 enable_hipe=no
+	 AC_MSG_WARN([Disable HiPE due to lack of MAP_FIXED and MAP_NORESERVE flags for mmap()])
+      fi
+   fi
+fi
+
 dnl check to auto-enable hipe here...
 if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
   if test -z "$M4"; then
 	enable_hipe=no
    	AC_MSG_NOTICE([HiPE disabled as no valid m4 is found in PATH])
-  elif test "$enable_halfword_emulator" = "yes"; then
-       if test X${enable_hipe} = Xyes; then
-              AC_MSG_ERROR([HiPE can not be combined with halfword emulator (yet)])
-       else		    
-   	      AC_MSG_NOTICE([HiPE auto-disabled on halfword emulator])
-       fi	
   else
   	case "$ARCH-$OPSYS" in
 	    x86-linux|amd64-linux|x86-darwin*|amd64-darwin*|ppc-linux|ppc64-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux)
@@ -2636,46 +2736,11 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
   fi
 fi
 
-case $ARCH-$OPSYS in
-	amd64-darwin*|x86-darwin*)
-		AC_MSG_CHECKING([For modern (leopard) style mcontext_t])
-		AC_TRY_COMPILE([
-				#include <stdlib.h>
-				#include <sys/types.h>
-				#include <unistd.h>
-				#include <mach/mach.h>
-				#include <pthread.h>
-				#include <machine/signal.h>
-				#include <ucontext.h>
-				],[
-				#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
-				#define __DARWIN__ 1
-				#endif
-
-				#ifndef __DARWIN__
-				#error inpossible
-				#else
-
-				mcontext_t mc = NULL;
-				int x = mc->__fs.__fpu_mxcsr;
-
-				#endif
-				],darwin_mcontext_leopard=yes,
-				darwin_mcontext_leopard=no)
-				if test X"$darwin_mcontext_leopard" = X"yes"; then
-				   AC_DEFINE(DARWIN_MODERN_MCONTEXT,[],[Modern style mcontext_t in MacOSX])
-				   AC_MSG_RESULT(yes)
-				else
-				   AC_MSG_RESULT(no)
-				fi
-		;;
-	*)
-		darwin_mcontext_leopard=no
-		;;
-esac
-
 if test X${enable_fp_exceptions} = Xauto ; then
    case $host_os in
+   	*linux*)
+	      enable_fp_exceptions=no
+	      AC_MSG_NOTICE([Floating point exceptions disabled by default on Linux]) ;;
 	darwin*)
 	      enable_fp_exceptions=no
 	      AC_MSG_NOTICE([Floating point exceptions disabled by default on MacOS X]) ;;
@@ -2707,6 +2772,10 @@ else
 #include <signal.h>
 #include <stdlib.h>
 
+#if defined(__clang__) || defined(__llvm__)
+#error "Clang/LLVM generates broken code for FP exceptions"
+#endif
+
 volatile int erl_fp_exception;
 
 /*
@@ -3265,16 +3334,6 @@ dnl (using the --disable, --enable and --with switches).
 dnl ----------------------------------------------------------------------
 
 #
-# Check if we should compile TSP app
-#
-
-TSP_APP=
-if test X${enable_tsp} = Xyes; then
-  TSP_APP=tsp
-fi
-AC_SUBST(TSP_APP)
-
-#
 # Check if we should enable HiPE.
 #
 
@@ -3292,6 +3351,13 @@ if test X${enable_hipe} = Xyes; then
      AC_DEFINE(HIPE,[1],[Define to enable HiPE])
      HIPE_HELPERS="xmerl syntax_tools edoc"
      ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS hipe"
+     case "$ARCH" in
+	  amd64)
+		# For now exec_alloc is only used for hipe on amd64
+		AC_MSG_NOTICE([Enable exec_alloc for hipe code allocation])
+		ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS exec_alloc"
+		;;
+     esac
   fi
 fi
 AC_SUBST(HIPE_HELPERS)
@@ -3307,19 +3373,6 @@ fi
 AC_SUBST(NATIVE_LIBS_ENABLED)
 
 #
-# Check if HiPE should use a standard installation of perfctr.
-#
-AC_SUBST(USE_PERFCTR)
-if test "x$HIPE_ENABLED" = "xyes" ; then
-  if test "x$with_perfctr" = "x" ; then
-      AC_CHECK_LIB(perfctr, vperfctr_info, [USE_PERFCTR=1
-	  AC_DEFINE(USE_PERFCTR,[1],[Define to enable hrvtime() on Linux systems with perfctr extension])])
-  elif test "x$with_perfctr" != "xno" ; then
-      USE_PERFCTR=1
-  fi
-fi
-
-#
 # Check for working poll().
 #
 AC_MSG_CHECKING([for working poll()])
@@ -3571,7 +3624,7 @@ dnl crypto
 #
 #--------------------------------------------------------------------
 
-DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE"
+DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE -I${ERL_TOP}/erts/emulator/sys/common"
 
 if test "X$ETHR_DEFS" = "X"; then
     DED_THR_DEFS="-D_THREAD_SAFE -D_REENTRANT"
@@ -3581,6 +3634,7 @@ fi
 DED_EMU_THR_DEFS=$EMU_THR_DEFS
 DED_CFLAGS="$CFLAGS $CPPFLAGS"
 if test "x$GCC" = xyes; then
+    DED_STATIC_CFLAGS="$DED_CFLAGS"
     DED_CFLAGS="$DED_CFLAGS -fPIC"
 fi
 
@@ -3588,11 +3642,14 @@ DED_EXT=so
 case $host_os in
     win32) DED_EXT=dll;;
     darwin*)
-	DED_CFLAGS="$DED_CFLAGS -fno-common";;
+	DED_CFLAGS="$DED_CFLAGS -fno-common"
+	DED_STATIC_CFLAGS="$DED_STATIC_CFLAGS -fno-common";;
     *)
 	;;
 esac
 
+DED_STATIC_CFLAGS="$DED_STATIC_CFLAGS -DSTATIC_ERLANG_NIF -DSTATIC_ERLANG_DRIVER"
+
 # If DED_LD is set in environment, we expect all DED_LD* variables
 # to be specified (cross compiling)
 if test "x$DED_LD" = "x"; then
@@ -3626,14 +3683,8 @@ case $host_os in
 				DED_LDFLAGS="-m64 $DED_LDFLAGS"
 				;;
 			*)
-				if test X${enable_darwin_universal} != Xyes; then
-					DED_LDFLAGS="-m32 $DED_LDFLAGS"
-				fi
 				;;
 		esac
-		if test X${enable_darwin_universal} = Xyes; then
-		   	DED_LDFLAGS="-arch ppc -arch i386 $DED_LDFLAGS"
-		fi	
 		DED_LD="$CC"
 		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
 	;;
@@ -3702,6 +3753,7 @@ fi
 AC_SUBST(DED_EXT)
 AC_SUBST(DED_SYS_INCLUDE)
 AC_SUBST(DED_CFLAGS)
+AC_SUBST(DED_STATIC_CFLAGS)
 AC_SUBST(DED_LD)
 AC_SUBST(DED_LDFLAGS)
 AC_SUBST(DED_LD_FLAG_RUNTIME_LIBRARY_PATH)
@@ -3717,14 +3769,20 @@ dnl
 LM_FIND_EMU_CC
 
 dnl
-dnl DTrace
+dnl DTrace & LTTNG
 dnl
 case $DYNAMIC_TRACE_FRAMEWORK in
      dtrace|systemtap)
         AC_CHECK_TOOL(DTRACE, dtrace, none)
         test "$DTRACE" = "none" && AC_MSG_ERROR([No dtrace utility found.]);
+        enable_lttng_test=no
 	enable_dtrace_test=yes;;
-     *) enable_dtrace_test=no;;
+     lttng)
+        enable_lttng_test=yes
+        enable_dtrace_test=no;;
+     *)
+        enable_lttng_test=no
+        enable_dtrace_test=no;;
 esac        
 		     
 AC_SUBST(DTRACE)
@@ -3752,21 +3810,28 @@ esac
 if test "$enable_dtrace_test" = "yes" ; then
         if test "$DTRACE" = "dtrace" ; then
                 AC_CHECK_HEADERS(sys/sdt.h)
+		AC_MSG_CHECKING([for 1-stage DTrace precompilation])
                 # The OS X version of dtrace prints a spurious line here.
                 if ! dtrace -h $DTRACE_CPP -Iemulator/beam -o ./foo-dtrace.h -s emulator/beam/erlang_dtrace.d; then
                         AC_MSG_ERROR([Could not precompile erlang_dtrace.d: dtrace -h failed])
                 fi
-                rm -f foo-dtrace.h
+		AC_MSG_RESULT([yes])
 
-                $RM -f $DTRACE_2STEP_TEST
-                if dtrace -G $DTRACE_CPP $DTRACE_BITS_FLAG -Iemulator/beam -o $DTRACE_2STEP_TEST -s emulator/beam/erlang_dtrace.d 2> /dev/null && \
-                   test -f $DTRACE_2STEP_TEST ; then
-                        rm $DTRACE_2STEP_TEST
+		AC_MSG_CHECKING([for 2-stage DTrace precompilation])
+                AC_TRY_COMPILE([ #include "foo-dtrace.h" ],
+                    [ERLANG_DIST_PORT_BUSY_ENABLED();],
+		    [$RM -f $DTRACE_2STEP_TEST
+		     dtrace -G $DTRACE_CPP $DTRACE_BITS_FLAG -Iemulator/beam -o $DTRACE_2STEP_TEST -s emulator/beam/erlang_dtrace.d conftest.$OBJEXT 2>&AS_MESSAGE_LOG_FD
+                     if test -f $DTRACE_2STEP_TEST; then
+			$RM $DTRACE_2STEP_TEST
                         DTRACE_ENABLED_2STEP=yes
-                        AC_MSG_NOTICE([dtrace precompilation for 2-stage DTrace successful])
-                else
-                        AC_MSG_NOTICE([dtrace precompilation for 1-stage DTrace successful])
-                fi
+		     fi],
+                    [])
+		$RM -f foo-dtrace.h
+		AS_IF([test "x$DTRACE_ENABLED_2STEP" = "xyes"],
+		      [AC_MSG_RESULT([yes])],
+                      [AC_MSG_RESULT([no])])
+
                 DTRACE_ENABLED=yes
                 case $OPSYS in
                     linux)
@@ -3784,6 +3849,37 @@ if test "$enable_dtrace_test" = "yes" ; then
         fi
 fi
 
+if test "$enable_lttng_test" = "yes" ; then
+    AC_CHECK_HEADERS(lttng/tracepoint.h)
+    AC_CHECK_HEADERS(lttng/tracepoint-event.h)
+    dnl The macro tracepoint_enabled is not present in older lttng versions
+    dnl checking for tracepoint_enabled
+    AC_MSG_CHECKING([for tracepoint_enabled in lttng/tracepoint.h])
+    AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+            [#include <lttng/tracepoint.h>
+             #define TRACEPOINT_PROVIDER org_erlang_otp
+             TRACEPOINT_EVENT(
+                 org_erlang_otp,
+                 dummy,
+                 TP_ARGS(int, my_int),
+                 TP_FIELDS(ctf_integer(int, my_int, my_int)))
+             #define TRACEPOINT_CREATE_PROBES
+             #define TRACEPOINT_DEFINE],
+            [if(tracepoint_enabled(org_erlang_otp,dummy)) do {} while(0)])],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_ERROR([no (available in lttng-ust v2.7)])])
+    if test "x$ac_cv_header_lttng_tracepoint_h" = "xyes" \
+        -a "x$ac_cv_header_lttng_tracepoint_event_h" = "xyes"; then
+        # No straight forward way to test for liblttng-ust when no public symbol exists,
+        # just add the lib.
+        LIBS="$LIBS -llttng-ust -ldl"
+    else
+        AC_MSG_ERROR([No LTTng support found.])
+    fi
+fi
+
+
 dnl
 dnl SSL, SSH and CRYPTO need the OpenSSL libraries
 dnl
@@ -3795,7 +3891,7 @@ dnl If set to --with-ssl=PATH we use that path as the prefix, i.e. we
 dnl use "PATH/include" and "PATH/lib".
 
 AC_SUBST(SSL_INCLUDE)
-AC_SUBST(SSL_ROOT)
+AC_SUBST(SSL_INCDIR)
 AC_SUBST(SSL_LIBDIR)
 AC_SUBST(SSL_CRYPTO_LIBNAME)
 AC_SUBST(SSL_SSL_LIBNAME)
@@ -3808,7 +3904,7 @@ AC_SUBST(STATIC_KERBEROS_LIBS)
 AC_SUBST(SSL_LINK_WITH_ZLIB)
 AC_SUBST(STATIC_ZLIB_LIBS)
 
-std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
+std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /"
 
 AC_ARG_WITH(ssl-zlib,
 AS_HELP_STRING([--with-ssl-zlib=PATH],
@@ -3889,6 +3985,29 @@ AS_HELP_STRING([--with-ssl=PATH], [specify location of OpenSSL include and lib])
 AS_HELP_STRING([--with-ssl], [use SSL (default)])
 AS_HELP_STRING([--without-ssl], [don't use SSL]))
 
+AC_ARG_WITH(ssl-incl,
+AS_HELP_STRING([--with-ssl-incl=PATH], [location of OpenSSL include dir, if different than specified by --with-ssl=PATH]),
+[
+case X$with_ssl in
+    X | Xyes | Xno) AC_MSG_ERROR([--with-ssl-incl=PATH set without --with-ssl=PATH]);;
+esac
+],
+[with_ssl_incl=$with_ssl]) #default
+
+AC_ARG_WITH(ssl-rpath,
+AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS],
+               [runtime library path for OpenSSL. Default is "yes", which equates to a
+	       number of standard locations. If "no", then no runtime
+	       library paths will be used. Anything else should be a
+	       comma separated list of paths.]),
+[
+case X$with_ssl in
+    Xno) AC_MSG_ERROR([--with-ssl-rpath set without --with-ssl]);;
+esac
+],
+[with_ssl_rpath=yes]) #default
+
+
 AC_ARG_ENABLE(dynamic-ssl-lib,
 AS_HELP_STRING([--disable-dynamic-ssl-lib],
                [disable using dynamic openssl libraries]),
@@ -3911,10 +4030,11 @@ ssl_done=yes # Default only one run
 
 # Remove all SKIP files from previous runs
 for a in ssl crypto ssh; do
-  /bin/rm -f $ERL_TOP/lib/$a/SKIP
+  $RM -f $ERL_TOP/lib/$a/SKIP
 done
 
 SSL_DYNAMIC_ONLY=$enable_dynamic_ssl
+SSL_STATIC_ONLY=no
 
 case "$erl_xcomp_without_sysroot-$with_ssl" in
   yes-* | no-no)
@@ -4002,7 +4122,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 	dir="$erl_xcomp_sysroot$rdir"
 	if test -f "$erl_xcomp_isysroot$rdir/include/openssl/opensslv.h"; then
 		is_real_ssl=yes
-		SSL_ROOT="$dir"
+		SSL_INCDIR="$dir"
 		if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
 			if test -f "$dir/lib/VC/libeay32.lib"; then
 				SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
@@ -4034,6 +4154,10 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 			else
 				is_real_ssl=no
 			fi
+		elif test -f "$dir/lib/powerpc/libsslcrypto.a"; then
+			SSL_CRYPTO_LIBNAME=sslcrypto
+			SSL_LIBDIR="$dir/lib/powerpc/"
+			SSL_RUNTIME_LIBDIR="$rdir/lib/powerpc/"
 		else
 			if test "x$ac_cv_sizeof_void_p" = "x8"; then
 				if test -f "$dir/lib64/libcrypto.a"; then
@@ -4057,18 +4181,20 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 				SSL_LIBDIR="$dir/lib"
 			fi
 		fi
-		if test '!' -f $SSL_LIBDIR/libcrypto.a; then
+		if test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.a"; then
 			SSL_DYNAMIC_ONLY=yes
+		elif test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.so" -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
+			SSL_STATIC_ONLY=yes
 		fi
 		SSL_BINDIR="$rdir/bin"
 		if test "x$is_real_ssl" = "xyes" ; then
 			SSL_INCLUDE="-I$dir/include"
 			old_CPPFLAGS=$CPPFLAGS
 			CPPFLAGS=$SSL_INCLUDE
-			AC_EGREP_CPP(yes,[
+			AC_EGREP_CPP(^yes$,[
 #include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER >= 0x0090700fL
-  yes
+yes
 #endif
 			],[
 			ssl_found=yes
@@ -4080,13 +4206,20 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 			if test "x$ssl_found" = "xyes"; then
 			   	if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
 				   	ssl_linkable=yes
+				elif test "x${SSL_CRYPTO_LIBNAME}" = "xsslcrypto"; then
+				# This should only be triggered seen OSE
+					ssl_linkable=yes
 				else
 					saveCFLAGS="$CFLAGS"
  					saveLDFLAGS="$LDFLAGS"
 					saveLIBS="$LIBS"
  					CFLAGS="$CFLAGS $SSL_INCLUDE"
- 					LDFLAGS="$LDFLAGS -L$SSL_LIBDIR"
-					LIBS="-lcrypto"
+					if test "x$SSL_STATIC_ONLY" = "xyes"; then
+						LIBS="${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.a"
+					else
+						LDFLAGS="$LDFLAGS -L$SSL_LIBDIR"
+						LIBS="$LIBS -l${SSL_CRYPTO_LIBNAME}"
+					fi
  					AC_TRY_LINK([
 					#include <stdio.h>
  					#include <openssl/hmac.h>],
@@ -4119,8 +4252,8 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 		  # Trust OpenBSD to have everything the in the correct locations.
 		  ssl_found=yes
 		  ssl_linkable=yes
-		  SSL_ROOT="$erl_xcomp_sysroot/usr"
-	          AC_MSG_RESULT([$SSL_ROOT])
+		  SSL_INCDIR="$erl_xcomp_sysroot/usr"
+	          AC_MSG_RESULT([$SSL_INCDIR])
 		  SSL_RUNTIME_LIB="/usr/lib"
 		  SSL_LIB="$erl_xcomp_sysroot/usr/lib"
 		  SSL_BINDIR="/usr/sbin"
@@ -4187,7 +4320,10 @@ dnl		so it is - be adoptable
     if test ! -d "$with_ssl" ; then
        AC_MSG_ERROR(Invalid path to option --with-ssl=PATH)
     fi
-    SSL_ROOT="$with_ssl"
+    if test ! -d "$with_ssl_incl" ; then
+       AC_MSG_ERROR(Invalid path to option --with-ssl-incl=PATH)
+    fi
+    SSL_INCDIR="$with_ssl_incl"
     SSL_CRYPTO_LIBNAME=crypto
     SSL_SSL_LIBNAME=ssl
     if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes" && test -d "$with_ssl/lib/VC"; then
@@ -4214,6 +4350,9 @@ dnl		so it is - be adoptable
 	    # This probably wont work, but that's what the user said, so...
 	    SSL_LIBDIR="$with_ssl/lib"
 	fi
+    elif test -f "$dir/lib/powerpc/libsslcrypto.a"; then
+	    SSL_CRYPTO_LIBNAME=sslcrypto
+	    SSL_LIBDIR="$with_ssl/lib/powerpc/"
     elif test "x$ac_cv_sizeof_void_p" = "x8"; then
 	if test -f "$with_ssl/lib64/libcrypto.a"; then
 		SSL_LIBDIR="$with_ssl/lib64"
@@ -4229,15 +4368,17 @@ dnl		so it is - be adoptable
     else	 
 	SSL_LIBDIR="$with_ssl/lib"
     fi
-    if test '!' -f $SSL_LIBDIR/libcrypto.a; then
+    if test '!' -f "${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.a"; then
 	SSL_DYNAMIC_ONLY=yes
+    elif test '!' -f ${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.so -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
+	SSL_STATIC_ONLY=yes
     fi
-    SSL_INCLUDE="-I$with_ssl/include"
+    SSL_INCLUDE="-I$with_ssl_incl/include"
     SSL_APP=ssl
     CRYPTO_APP=crypto
     SSH_APP=ssh
     if test "$cross_compiling" = "yes"; then
-	SSL_RUNTIME_LIBDIR=`echo "$SSL_LIBDIR" | sed -n "s|^$erl_xcomp_sysroot\(.*\)\$|\1|p"`
+	SSL_RUNTIME_LIBDIR=`echo "$SSL_LIBDIR" | sed -n "s|^$erl_xcomp_sysroot\(/*\)\(.*\)\$|/\2|p"`
     else
 	SSL_RUNTIME_LIBDIR="$SSL_LIBDIR"
     fi
@@ -4248,10 +4389,10 @@ if test "x$SSL_APP" != "x" ; then
     AC_MSG_CHECKING(for OpenSSL kerberos 5 support)
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=$SSL_INCLUDE
-    AC_EGREP_CPP(yes,[
+    AC_EGREP_CPP(^yes$,[
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_KRB5
-  yes
+yes
 #endif
       ],[
       AC_MSG_RESULT([yes])
@@ -4295,8 +4436,8 @@ if test "x$SSL_APP" != "x" ; then
     SSL_KRB5_INCLUDE=
     if test "x$ssl_krb5_enabled" = "xyes" ; then
         AC_MSG_CHECKING(for krb5.h in standard locations)
-	for dir in $extra_dir "$SSL_ROOT/include" "$SSL_ROOT/include/openssl" \
-		"$SSL_ROOT/include/kerberos" \
+	for dir in $extra_dir "$SSL_INCDIR/include" "$SSL_INCDIR/include/openssl" \
+		"$SSL_INCDIR/include/kerberos" \
 		"$erl_xcomp_isysroot/cygdrive/c/kerberos/include" \
 		"$erl_xcomp_isysroot/usr/local/kerberos/include" \
 		"$erl_xcomp_isysroot/usr/kerberos/include" \
@@ -4332,7 +4473,12 @@ cc_rflg="$CFLAG_RUNTIME_LIBRARY_PATH"
 ld_rflg="$LDFLAG_RUNTIME_LIBRARY_PATH"
 ded_ld_rflg="$DED_LD_FLAG_RUNTIME_LIBRARY_PATH"
 
-if test "$SSL_APP" != "" && test "$SSL_DYNAMIC_ONLY" = "yes" && \
+
+case "$with_ssl_rpath" in
+
+yes)   # Use standard lib locations for ssl runtime library path
+
+  if test "$SSL_APP" != "" && test "$SSL_DYNAMIC_ONLY" = "yes" && \
    { test "$cc_rflg" != "" || test "$ld_rflg" != "" || test "$ded_ld_rflg" != ""; } ; then
 
     AC_MSG_CHECKING(for ssl runtime library path to use)
@@ -4416,7 +4562,25 @@ if test "$SSL_APP" != "" && test "$SSL_DYNAMIC_ONLY" = "yes" && \
 
     AC_MSG_RESULT([$rpath])
     test "$rpath" != "" || AC_MSG_WARN([Cannot set run path during linking])
-fi
+  fi
+  ;;
+
+no)   # Use no ssl runtime library path
+  SSL_DED_LD_RUNTIME_LIBRARY_PATH=
+  ;;
+
+*)    # Use ssl runtime library paths set by --with-ssl-rpath (without any check)
+  ded_ld_rpath=
+  delimit=
+  for dir in `echo $with_ssl_rpath | sed "s/,/ /g"`; do
+      ded_ld_rpath="$ded_ld_rpath$delimit$ded_ld_rflg$dir"
+      delimit=" "
+  done
+  SSL_DED_LD_RUNTIME_LIBRARY_PATH="$ded_ld_rpath"
+  ;;
+
+esac
+
 
 #--------------------------------------------------------------------
 # Os mon stuff.
@@ -4425,18 +4589,32 @@ AC_SUBST(os_mon_programs)
 AC_SUBST(CPU_SUP_LIBS)
 
 AC_CHECK_LIB(kstat, kstat_open, [ 
-	os_mon_programs="$os_mon_programs cpu_sup"	 
+	use_cpu_sup=yes
 	CPU_SUP_LIBS="$CPU_SUP_LIBS -lkstat"
 	])
 
+AC_CHECK_LIB(kvm, kvm_open, [
+	use_cpu_sup=yes
+	CPU_SUP_LIBS="$CPU_SUP_LIBS -lkvm"
+	])
+
 case $host_os in
 	solaris2*)
 		os_mon_programs="$os_mon_programs ferrule mod_syslog" ;;
+	darwin*)
+		use_cpu_sup=yes ;;
+	openbsd*)
+		use_cpu_sup=yes ;;
 	linux*)
-		os_mon_programs="$os_mon_programs cpu_sup" ;;
+		use_cpu_sup=yes ;;
+	freebsd*)
+		use_cpu_sup=yes ;;
 esac
 
-			
+if test "$use_cpu_sup" = "yes"; then
+    os_mon_programs="$os_mon_programs cpu_sup"
+fi
+
 AC_ARG_WITH(javac,
 AS_HELP_STRING([--with-javac=JAVAC], [specify Java compiler to use])
 AS_HELP_STRING([--with-javac], [use a Java compiler if found (default)])
@@ -4449,7 +4627,7 @@ need_java="jinterface ic/java_src"
 
 # Remove all SKIP files from previous runs
 for a in $need_java ; do
-  /bin/rm -f $ERL_TOP/lib/$a/SKIP
+  $RM -f $ERL_TOP/lib/$a/SKIP
 done
 
 if test "X$with_javac" = "Xno"; then
@@ -4467,12 +4645,12 @@ fi
 
 AC_CHECK_PROGS(JAVAC, $check_javac)
 if test -n "$JAVAC"; then
-  dnl Make sure it's at least JDK 1.5
-  AC_CACHE_CHECK(for JDK version 1.5, 
-     ac_cv_prog_javac_ver_1_5,
+  dnl Make sure it's at least JDK 1.6
+  AC_CACHE_CHECK(for JDK version 1.6, 
+     ac_cv_prog_javac_ver_1_6,
      [ERL_TRY_LINK_JAVA([], [for (String i : args);],
-        ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
-  if test $ac_cv_prog_javac_ver_1_5 = no; then
+        ac_cv_prog_javac_ver_1_6=yes, ac_cv_prog_javac_ver_1_6=no)])
+  if test $ac_cv_prog_javac_ver_1_6 = no; then
     unset -v JAVAC
   fi
 fi
@@ -4500,7 +4678,7 @@ dnl this deliberately does not believe that 'gcc' is a C++ compiler
 AC_CHECK_TOOLS(CXX, [$CCC c++ g++ CC cxx cc++ cl], false)
 
 # Remove SKIP file from previous run
-/bin/rm -f $ERL_TOP/lib/orber/SKIP
+$RM -f $ERL_TOP/lib/orber/SKIP
 
 if test "$CXX" = false; then
   echo "No C++ compiler found" > $ERL_TOP/lib/orber/SKIP
@@ -4593,7 +4771,7 @@ AH_BOTTOM([
 #define HAVE_GETHRVTIME
 #endif
 
-#ifndef HAVE_FINITE
+#if !defined(HAVE_ISFINITE) && !defined(HAVE_FINITE)
 # if defined(HAVE_ISINF) && defined(HAVE_ISNAN)
 #  define USE_ISINF_ISNAN
 # endif
@@ -4609,6 +4787,31 @@ if test "x$GCC" = xyes; then
 fi
 
 dnl ----------------------------------------------------------------------
+dnl Enable -fsanitize= flags.
+dnl ----------------------------------------------------------------------
+
+m4_define(DEFAULT_SANITIZERS, [address,undefined])
+AC_ARG_ENABLE(
+    sanitizers,
+    AS_HELP_STRING(
+        [--enable-sanitizers@<:@=comma-separated list of sanitizers@:>@],
+	    [Default=DEFAULT_SANITIZERS]),
+[
+case "$enableval" in
+    no) sanitizers= ;;
+    yes) sanitizers="-fsanitize=DEFAULT_SANITIZERS" ;;
+    *) sanitizers="-fsanitize=$enableval" ;;
+esac
+CFLAGS="$CFLAGS $sanitizers"
+LDFLAGS="$LDFLAGS $sanitizers"
+])
+
+dnl ----------------------------------------------------------------------
+dnl Check for log2
+dnl ----------------------------------------------------------------------
+AC_CHECK_FUNCS([log2])
+
+dnl ----------------------------------------------------------------------
 dnl Output the result.
 dnl ----------------------------------------------------------------------