erts: Cleanup configure and makefiles after non-smp removal

4 files changed, 77 insertions, 324 deletions

diff --git a/erts/Makefile b/erts/Makefile
index 12d2ec57a8..73d8560c1e 100644
--- a/erts/Makefile
+++ b/erts/Makefile
@@ -34,7 +34,7 @@ ERTSDIRS += start_scripts
 endif
 
 .PHONY: all
-all: $(FLAVORS)
+all: smp
 
 .PHONY: docs
 docs:
@@ -44,7 +44,7 @@ docs:
 debug opt lcnt clean:
 	$(V_at)for d in emulator $(ERTSDIRS); do \
 		if test -d $$d; then \
-			( cd $$d && $(MAKE) $@ FLAVOR=$(FLAVOR) ) || exit $$? ; \
+			( cd $$d && $(MAKE) $@ ) || exit $$?; \
 		fi ; \
 	done
 	(cd preloaded/src && $(MAKE) ../ebin/erts.app)
@@ -54,10 +54,10 @@ debug opt lcnt clean:
 # - don't use them in scripts or assume they will always stay like this!
 #
 
-.PHONY: $(FLAVORS)
-$(FLAVORS):
+.PHONY: smp
+smp:
 	$(V_at)for type in $(TYPES); do \
-		( $(MAKE) $$type FLAVOR=$@ ); \
+		( $(MAKE) $$type ) || exit $$?; \
 	done
 
 # Make erl script and erlc in $(ERL_TOP)/bin which runs the compiled version
@@ -129,10 +129,8 @@ makefiles:
 
 .PHONY: release
 release:
-	$(V_at)for f in $(FLAVORS); do \
-		for t in $(TYPES); do \
-		  ( cd emulator && $(MAKE) release FLAVOR=$$f TYPE=$$t ) \
-		done \
+	for t in $(TYPES); do \
+	  ( cd emulator && $(MAKE) release TYPE=$$t ) || exit $$?; \
 	done
 	$(V_at)for d in $(ERTSDIRS) $(XINSTDIRS); do \
 		if test -d $$d; then \
diff --git a/erts/configure.in b/erts/configure.in
index 7c84ce9c75..53386d5500 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -113,8 +113,6 @@ AS_HELP_STRING([--enable-bootstrap-only],
 	# Disable stuff not necessary in a bootstrap only system in order
 	# to speed up things by reducing the amount of stuff needing to be
 	# built...
-	enable_threads=no
-	enable_smp_support=no
 	with_termcap=no
 	with_ssl=no
 	with_ssl_zlib=no
@@ -124,14 +122,6 @@ AS_HELP_STRING([--enable-bootstrap-only],
   fi	
 ])
 
-AC_ARG_ENABLE(threads,
-AS_HELP_STRING([--enable-threads], [enable async thread support])
-AS_HELP_STRING([--disable-threads], [disable async thread support]),
-[ case "$enableval" in
-    no) enable_threads=no ;;
-    *)  enable_threads=yes ;;
-  esac ], enable_threads=unknown)
-
 AC_ARG_ENABLE(dirty-schedulers,
 AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]),
 [ case "$enableval" in
@@ -146,22 +136,6 @@ AS_HELP_STRING([--enable-dirty-schedulers-test], [enable dirty scheduler test (f
     *) enable_dirty_schedulers_test=no ;;
   esac ], enable_dirty_schedulers_test=no)
 
-AC_ARG_ENABLE(smp-support,
-AS_HELP_STRING([--enable-smp-support], [enable smp support])
-AS_HELP_STRING([--disable-smp-support], [disable smp support]),
-[ case "$enableval" in
-    no) enable_smp_support=no ;;
-    *)  enable_smp_support=yes ;;
-  esac ], enable_smp_support=unknown)
-
-AC_ARG_ENABLE(plain-emulator,
-AS_HELP_STRING([--enable-plain-emulator], [enable plain emulator])
-AS_HELP_STRING([--disable-plain-emulator], [disable plain emulator]),
-[ case "$enableval" in
-    no) enable_plain_emulator=no ;;
-    *)  enable_plain_emulator=yes ;;
-  esac ], enable_plain_emulator=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]),
@@ -997,73 +971,17 @@ dnl are set by ERL_FIND_ETHR_LIB
 ERL_FIND_ETHR_LIB
 
 if test "X$ETHR_LIB_NAME" = "X"; then
-    found_threads=no
-else
-    found_threads=yes
+   AC_MSG_ERROR([cannot build emulator since no thread library was found])
 fi
 
-FLAVORS=
 TYPES=opt
-ERTS_BUILD_SMP_EMU=$enable_smp_support
-AC_MSG_CHECKING(whether an emulator with smp support should be built)
-case $ERTS_BUILD_SMP_EMU in
-    yes)
-	AC_MSG_RESULT(yes; enabled by user)
-	;;
-    no)
-	AC_MSG_RESULT(no; disabled by user)
-	;;
-    unknown)
-	AC_TRY_COMPILE([],[
-			#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-			;
-			#else
-			#error old or no gcc
-			#endif
-			],
-			gcc_smp=okgcc,
-			gcc_smp=oldornogcc)
-	ERTS_BUILD_SMP_EMU=yes
-	case "$enable_threads-$gcc_smp-$found_threads-$host_os" in
-
-	    no-*)
-		AC_MSG_RESULT(no; threads disabled by user)
-		ERTS_BUILD_SMP_EMU=no
-		;;
-
-	    *-okgcc-yes-*)
-		AC_MSG_RESULT(yes)
-		ERTS_BUILD_SMP_EMU=yes
-		;;
-
-	    *-win32)
-		AC_MSG_RESULT(yes)
-		ERTS_BUILD_SMP_EMU=yes
-		;;
-
-	    *-oldornogcc-*)
-		AC_MSG_RESULT(no; old gcc or no gcc found)
-		ERTS_BUILD_SMP_EMU=no
-		;;
-
-	    *)
-		AC_MSG_RESULT(no)
-		ERTS_BUILD_SMP_EMU=no
-		;;
-	esac
-	;;
-esac
 
 AC_MSG_CHECKING(whether dirty schedulers should be enabled)
-case $ERTS_BUILD_SMP_EMU-$enable_dirty_schedulers in
-     yes-yes)
+case $enable_dirty_schedulers in
+     yes)
 	DIRTY_SCHEDULER_SUPPORT=yes;;
-     yes-default)
+     default)
 	DIRTY_SCHEDULER_SUPPORT=yes;;
-     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
@@ -1086,26 +1004,15 @@ test $DIRTY_SCHEDULER_TEST != yes || {
 EOF
 }
 
-if test $ERTS_BUILD_SMP_EMU = yes; then
-
-        DEFAULT_FLAVOR=smp
-        FLAVORS="$FLAVORS smp"
-
-	if test $found_threads = no; then
-	    AC_MSG_ERROR([cannot build smp enabled emulator since no thread library was found])
-	fi
-
-	AC_DEFINE(ERTS_HAVE_SMP_EMU, 1, [Define if the smp emulator is built])
-
-	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])
+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
+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
@@ -1122,18 +1029,18 @@ if test $ERTS_BUILD_SMP_EMU = yes; then
                    more information.
 
 EOF
-		fi
-		;;
+	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-*)
+	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-no-yes)
+  no-no-yes)
 
-		test -f "$ERL_TOP/erts/CONF_INFO" ||
-		    echo "" > "$ERL_TOP/erts/CONF_INFO"
-		cat >> $ERL_TOP/erts/CONF_INFO <<EOF
+	test -f "$ERL_TOP/erts/CONF_INFO" ||
+	    echo "" > "$ERL_TOP/erts/CONF_INFO"
+	cat >> $ERL_TOP/erts/CONF_INFO <<EOF
 
                  No native atomic implementation available.
                  Fallbacks implemented using spinlocks will be
@@ -1142,13 +1049,12 @@ EOF
 		 this.
 
 EOF
-		;;
-
-	  no-no-no)
+	;;
 
-		test -f "$ERL_TOP/erts/CONF_INFO" ||
-		    echo "" > "$ERL_TOP/erts/CONF_INFO"
-		cat >> "$ERL_TOP/erts/CONF_INFO" <<EOF
+  no-no-no)
+	test -f "$ERL_TOP/erts/CONF_INFO" ||
+	    echo "" > "$ERL_TOP/erts/CONF_INFO"
+	cat >> "$ERL_TOP/erts/CONF_INFO" <<EOF
 
                  No native atomic implementation, nor no native
                  spinlock implementation available. Fallbacks
@@ -1157,76 +1063,11 @@ EOF
                  will suffer immensely due to this.
 
 EOF
-		;;
-
-	esac
-
-	enable_threads=force
-fi
-
-AC_SUBST(ERTS_BUILD_SMP_EMU)
-
-ERTS_BUILD_PLAIN_EMU=$enable_plain_emulator
-AC_MSG_CHECKING(whether an emulator without smp support should be built)
-case $ERTS_BUILD_PLAIN_EMU in
-    yes)
-	AC_MSG_RESULT(yes; enabled by user)
-	;;
-    no)
-	AC_MSG_RESULT(no; disabled by user)
 	;;
-    unknown)
-        case "$enable_threads-$ERTS_BUILD_SMP_EMU" in
-            no-*)
-                ERTS_BUILD_PLAIN_EMU=yes
-                AC_MSG_RESULT(yes)
-                ;;
-            *-no)
-                ERTS_BUILD_PLAIN_EMU=yes
-                AC_MSG_RESULT(yes; enabled as smp emulator was disabled)
-                ;;
-            *)
-                ERTS_BUILD_PLAIN_EMU=no
-                AC_MSG_RESULT(no)
-                ;;
-        esac
-        ;;
-esac
-
-case $ERTS_BUILD_PLAIN_EMU in
-     yes)
-     	AC_DEFINE(ERTS_HAVE_PLAIN_EMU, 1, [Define if the non-smp emulator is built])
-        FLAVORS="$FLAVORS plain"
-        test -f "$ERL_TOP/erts/CONF_INFO" || echo "" > "$ERL_TOP/erts/CONF_INFO"
-        cat >> $ERL_TOP/erts/CONF_INFO <<EOF
-
-            The PLAIN aka NON-SMP emulator has been enabled.
-            This is a DEPRECATED feature scheduled for removal
-            in a future major release.
 
-EOF
-        ;;
-     no)
-        ;;
 esac
-
-AC_SUBST(ERTS_BUILD_PLAIN_EMU)
-AC_SUBST(FLAVORS)
 AC_SUBST(TYPES)
 
-case "$ERTS_BUILD_PLAIN_EMU-$ERTS_BUILD_SMP_EMU" in
-     no-no)
-          AC_MSG_ERROR([both smp and non-smp emulators have been disabled, one of them has to be enabled])
-          ;;
-     *-no)
-          DEFAULT_FLAVOR=plain
-          ;;
-        *)
-          ;;
-esac
-
-AC_SUBST(DEFAULT_FLAVOR)
-
 AC_CHECK_FUNCS([posix_fadvise closefrom])
 AC_CHECK_HEADERS([linux/falloc.h])
 dnl * Old glibcs have broken fallocate64(). Make sure not to use it.
@@ -1286,121 +1127,65 @@ if test $i_cv_posix_fallocate_works = yes; then
 fi
 
 #
-# Figure out if the emulator should use threads. The default is set above
-# in the enable_threads variable. It can have the following values:
-#
-#   no      single-threaded emulator requested
-#   yes     multi-threaded emulator requested
-#   force   multi-threaded emulator required
-#
 # EMU_THR_LIB_NAME, EMU_THR_LIBS, EMU_THR_X_LIBS, and EMU_THR_DEFS is
 # used by the emulator, and can (but should not) be used by applications
 # that only require thread support when the emulator has thread support.
 # Other applications should use ETHR_LIB_NAME, ETHR_LIBS, ETHR_X_LIBS,
 # and ETHR_DEFS.
 #
-AC_MSG_CHECKING(whether the emulator should use threads)
 
 EMU_THR_LIB_NAME=
 EMU_THR_X_LIBS=
 EMU_THR_LIBS=
 EMU_THR_DEFS=
-emu_threads=no
-
-case "$enable_threads"-"$host_os" in
-	*-win32)
-		# The windows erlang emulator can never run without threads.
-		# It has to be enabled or the emulator will crash. Until that
-		# is fixed we force threads on win32.
-		enable_threads=force ;;
-	yes-osf*)
-		# The emulator hang when threads are enabled on osf
-		AC_MSG_ERROR(unresolved problems exist with threads on this platform) ;;
-	*) ;;
-esac
 
-case "$enable_threads"-"$found_threads" in
-    force-yes)
-	emu_threads=yes
-	AC_MSG_RESULT(yes; thread support required and therefore forced) ;;
-    yes-yes)
-	emu_threads=yes
-	AC_MSG_RESULT(yes; enabled by user) ;;
-    unknown-yes)
-	case $host_os in
-	    solaris*|linux*|darwin*|win32)
-		emu_threads=yes
-		AC_MSG_RESULT(yes; default on this platform)
-		;;
-	    *)
-		AC_MSG_RESULT(no; default on this platform)
-		;;
-	esac
-	;;
-    no-yes)
-	AC_MSG_RESULT(no; thread support found but disabled by user) ;;
-    unknown-no|no-no)
-	AC_MSG_RESULT(no) ;;
-    force-no)
-	AC_MSG_ERROR(thread support required but not found) ;;
-    yes-no)
-	AC_MSG_ERROR(thread support enabled by user but not found) ;;
-    *)
-	AC_MSG_ERROR(internal error) ;;
-esac
+# Threads enabled for emulator
+EMU_THR_LIB_NAME=$ETHR_LIB_NAME
+EMU_THR_X_LIBS=$ETHR_X_LIBS
+EMU_THR_LIBS=$ETHR_LIBS
+EMU_THR_DEFS=$ETHR_DEFS
+ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS threads"
+AC_MSG_CHECKING(whether lock checking should be enabled)
+AC_MSG_RESULT($enable_lock_check)
+if test "x$enable_lock_check" != "xno"; then
+    EMU_THR_DEFS="$EMU_THR_DEFS -DERTS_ENABLE_LOCK_CHECK"
+fi
 
-if test $emu_threads != yes; then
-	enable_lock_check=no
-	enable_lock_count=no
-else
-	# Threads enabled for emulator
-	EMU_THR_LIB_NAME=$ETHR_LIB_NAME
-	EMU_THR_X_LIBS=$ETHR_X_LIBS
-	EMU_THR_LIBS=$ETHR_LIBS
-	EMU_THR_DEFS=$ETHR_DEFS
-	ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS threads"
-	AC_MSG_CHECKING(whether lock checking should be enabled)
-	AC_MSG_RESULT($enable_lock_check)
-	if test "x$enable_lock_check" != "xno"; then
-	    EMU_THR_DEFS="$EMU_THR_DEFS -DERTS_ENABLE_LOCK_CHECK"
-	fi
+AC_MSG_CHECKING(whether lock counters should be enabled)
+AC_MSG_RESULT($enable_lock_count)
+if test "x$enable_lock_count" != "xno"; then
+    TYPES="$TYPES lcnt"
+fi
 
-	AC_MSG_CHECKING(whether lock counters should be enabled)
-	AC_MSG_RESULT($enable_lock_count)
-	if test "x$enable_lock_count" != "xno"; then
-	    TYPES="$TYPES lcnt"
+case $host_os in
+    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
+	    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
+	;;
+    *)
+	;;
+esac
 
-	case $host_os in
-	    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
-		    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
-		;;
-	    *)
-		;;
-	esac
-
-	# Remove -D_WIN32_WINNT*, -DWINVER* and -D_GNU_SOURCE from EMU_THR_DEFS
-	# (defined in CFLAGS). Note that we want to keep these flags
-	# in ETHR_DEFS, but not in EMU_THR_DEFS.
-	new_emu_thr_defs=
-	for thr_def in $EMU_THR_DEFS; do
-	    case $thr_def in
-		-D_GNU_SOURCE*|-D_WIN32_WINNT*|-DWINVER*)
-		    ;;
-		*)
-		    new_emu_thr_defs="$new_emu_thr_defs $thr_def"
-		    ;;
-	    esac
-	done
-	EMU_THR_DEFS=$new_emu_thr_defs
-fi
+# Remove -D_WIN32_WINNT*, -DWINVER* and -D_GNU_SOURCE from EMU_THR_DEFS
+# (defined in CFLAGS). Note that we want to keep these flags
+# in ETHR_DEFS, but not in EMU_THR_DEFS.
+new_emu_thr_defs=
+for thr_def in $EMU_THR_DEFS; do
+    case $thr_def in
+	-D_GNU_SOURCE*|-D_WIN32_WINNT*|-DWINVER*)
+	    ;;
+	*)
+	    new_emu_thr_defs="$new_emu_thr_defs $thr_def"
+	    ;;
+    esac
+done
+EMU_THR_DEFS=$new_emu_thr_defs
 
 AC_SUBST(EMU_THR_LIB_NAME)
 AC_SUBST(EMU_THR_X_LIBS)
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 1ae905276d..88ac3f652c 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -178,27 +178,10 @@ endif
 # NOTE: When adding a new type update ERL_BUILD_TYPE_MARKER in sys/unix/sys.c
 #
 
-FLAVOR=$(DEFAULT_FLAVOR)
-
-ifeq ($(FLAVOR),plain)
-
-DS_SUPPORT=no
-DS_TEST=no
-
-FLAVOR_MARKER=
-FLAVOR_FLAGS=
-ENABLE_ALLOC_TYPE_VARS += nofrag
-M4FLAGS +=
-
-else # FLAVOR
-
-# If flavor isn't one of the above, it *is* smp flavor...
 override FLAVOR=smp
 
 FLAVOR_MARKER=.smp
-FLAVOR_FLAGS=-DERTS_SMP
 ENABLE_ALLOC_TYPE_VARS += smp nofrag
-M4FLAGS += -DERTS_SMP=1
 ifeq ($(DIRTY_SCHEDULER_SUPPORT),yes)
 THR_DEFS += -DERTS_DIRTY_SCHEDULERS
 DS_SUPPORT=yes
@@ -215,8 +198,6 @@ DS_SUPPORT=no
 DS_TEST=no
 endif # DIRTY_SCHEDULER_SUPPORT
 
-endif # FLAVOR
-
 TF_MARKER=$(TYPEMARKER)$(FLAVOR_MARKER)
 
 ifeq ($(TYPE)-@HAVE_VALGRIND@,valgrind-no)
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4
index f034c4700c..bebe20a18e 100644
--- a/erts/emulator/hipe/hipe_bif_list.m4
+++ b/erts/emulator/hipe/hipe_bif_list.m4
@@ -262,18 +262,12 @@ noproc_primop_interface_2(nbif_bs_get_utf16, erts_bs_get_utf16)
 noproc_primop_interface_2(nbif_bs_validate_unicode_retract, hipe_bs_validate_unicode_retract)
 
 /*
- * Bit-syntax primops. The ERTS_SMP runtime system requires P,
+ * Bit-syntax primops. The runtime system requires P,
  * hence the use of nocons_nofail_primop_interface_N().
- * When ERTS_SMP is disabled, noproc_primop_interface_N()
- * should be used instead.
  */
 nocons_nofail_primop_interface_5(nbif_bs_put_small_float, hipe_bs_put_small_float)
 noproc_primop_interface_5(nbif_bs_put_bits, hipe_bs_put_bits)
-ifelse(ERTS_SMP,1,`
 nocons_nofail_primop_interface_5(nbif_bs_put_big_integer, hipe_bs_put_big_integer)
-',`
-noproc_primop_interface_5(nbif_bs_put_big_integer, hipe_bs_put_big_integer)
-')dnl
 
 nofail_primop_interface_0(nbif_check_get_msg, hipe_check_get_msg)
 
@@ -283,13 +277,8 @@ nocons_nofail_primop_interface_0(nbif_emulate_fpe, hipe_emulate_fpe)
 
 noproc_primop_interface_1(nbif_emasculate_binary, hipe_emasculate_binary)
 
-/*
- * SMP-specific stuff
- */
-ifelse(ERTS_SMP,1,`
 nocons_nofail_primop_interface_0(nbif_clear_timeout, hipe_clear_timeout)
 noproc_primop_interface_1(nbif_atomic_inc, hipe_atomic_inc)
-',)dnl
 
 /*
  * BIFs that disable GC while trapping are called via a wrapper