From c5ee304b5e73a5e5a9ac38c1180971baa051824b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Thu, 18 Jun 2015 11:28:09 +0200
Subject: erts: Remove halfword from configure

---
 configure.in      |  4 ----
 erts/configure.in | 44 --------------------------------------------
 2 files changed, 48 deletions(-)

diff --git a/configure.in b/configure.in
index 64b0bdac6d..e8c8680e19 100644
--- a/configure.in
+++ b/configure.in
@@ -208,10 +208,6 @@ AS_HELP_STRING([--disable-threads], [disable async thread support]))
 AC_ARG_ENABLE(dirty-schedulers,
 AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]))
 
-AC_ARG_ENABLE(halfword-emulator,
-AS_HELP_STRING([--enable-halfword-emulator],
-               [enable halfword emulator (only for 64bit builds). Note: Halfword emulator is marked as deprecated and scheduled for removal in future major release.]))
-
 AC_ARG_ENABLE(smp-support,
 AS_HELP_STRING([--enable-smp-support], [enable smp support])
 AS_HELP_STRING([--disable-smp-support], [disable smp support]))
diff --git a/erts/configure.in b/erts/configure.in
index 22ca7ec17d..293ff825f8 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -143,14 +143,6 @@ AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]),
     *)  enable_dirty_schedulers=yes ;;
   esac ], enable_dirty_schedulers=no)
 
-AC_ARG_ENABLE(halfword-emulator,
-AS_HELP_STRING([--enable-halfword-emulator],
-               [enable halfword emulator (only for 64bit builds). Note: Halfword emulator is marked as deprecated and scheduled for removal in future major release.]),
-[ case "$enableval" in
-    no) enable_halfword_emualtor=no ;;
-    *)  enable_halfword_emulator=yes ;;
-  esac ], enable_halfword_emulator=unknown)
-
 AC_ARG_ENABLE(smp-support,
 AS_HELP_STRING([--enable-smp-support], [enable smp support])
 AS_HELP_STRING([--disable-smp-support], [disable smp support]),
@@ -787,36 +779,6 @@ esac
 	
 AC_SUBST(LIBCARBON)
 
-dnl Check if we should/can build a halfword emulator
-
-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])
-
-		test -f "$ERL_TOP/erts/CONF_INFO" ||
-		    echo "" > "$ERL_TOP/erts/CONF_INFO"
-		cat >> $ERL_TOP/erts/CONF_INFO <<EOF
-
-                 The HALFWORD emulator has been enabled.
-                 This is a DEPRECATED feature scheduled for removal
-                 in a future major release.
-
-EOF
-	else
-		AC_MSG_ERROR(no; halfword emulator not supported on this architecture)
-	fi
-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
 AC_PROG_CPP
@@ -2825,12 +2787,6 @@ 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)
-- 
cgit v1.2.3