aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-03-24 21:18:11 +0100
committerSverker Eriksson <[email protected]>2014-03-24 21:18:11 +0100
commit05432fb0eec53cab53670e053f22aa3c3ad61d97 (patch)
treeb46f044e04c8f6edfeb7df154ee8afd66793c00f /erts
parentd2725ed41a16fcc828f0e1af77da2798404f0bdb (diff)
parent03d322c57e070998a9b321ef0221436c15180455 (diff)
downloadotp-05432fb0eec53cab53670e053f22aa3c3ad61d97.tar.gz
otp-05432fb0eec53cab53670e053f22aa3c3ad61d97.tar.bz2
otp-05432fb0eec53cab53670e053f22aa3c3ad61d97.zip
Merge branch 'sverk/halfword-deprecate/OTP-11777'
* sverk/halfword-deprecate/OTP-11777: erts: Deprecate halfword emulator
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in14
1 files changed, 12 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 6d5eca8966..208c294106 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2,7 +2,7 @@ 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-2014. 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
@@ -144,7 +144,7 @@ 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)]),
+ [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 ;;
@@ -816,6 +816,16 @@ if test "$enable_halfword_emulator" = "yes"; then
[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