Merge branch 'maint'

* maint:
  Remove stale code for hybrid heap and incremental GC
  Remove the hipe_bifs:show_message_area/0 BIF
  Remove support for erlang:system_info(global_heaps_size)
  Remove the erlang:garbage_collect_message_area/0 BIF
  Remove workarounds for hybrid and shared heaps in test suites

Conflicts:
	erts/doc/src/erlang.xml
	erts/emulator/beam/erl_message.c
	erts/emulator/beam/erl_process.c
	erts/emulator/beam/erl_process.h
	erts/emulator/hipe/hipe_bif2.tab
	lib/hipe/cerl/erl_bif_types.erl

1 files changed, 3 insertions, 4 deletions

diff --git a/otp_build b/otp_build
index c6c73fedfa..1fee139666 100755
--- a/otp_build
+++ b/otp_build
@@ -51,7 +51,6 @@ usage ()
     echo "    release <target_dir> - creates a small release to <target_dir>"
     echo "    release [-a] <target_dir> - creates full release to <target_dir>"
     echo "    smp [-a] - build an Erlang system, smp flavor only"
-    echo "    hybrid [-a] - build an Erlang system, hybrid flavor only"
     echo "    tests <dir> - Build testsuites to <dir>"
     echo ""
     echo "These are for cleaning up an open source distribution"
@@ -1309,8 +1308,8 @@ cd $ERL_TOP
 
 determine_version_controller
 
-# Unset ERL_FLAGS and ERL_<Release>_FLAGS to prevent, for instance,
-# a value of "-hybrid" to run the hybrid emulator during bootstrap.
+# Unset ERL_FLAGS and ERL_<Release>_FLAGS during bootstrap to
+# prevent potential problems
 sys_vsn=`awk '/SYSTEM_VSN = / {print $3}' < erts/vsn.mk`
 sys_erl_flags="ERL_${sys_vsn}_FLAGS"
 unset ERL_FLAGS
@@ -1420,7 +1419,7 @@ case "$1" in
 		do_lazy_configure_target_clean;;
 	opt)
 		do_boot;;
-	plain|smp|hybrid)
+	plain|smp)
 		if [ $minus_a_flag = false ]; then 
 		    TYPE=opt
 		fi;