From 5c2dad487e6af1a48fa3a1f3d985b6b891788bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 10 May 2012 12:09:07 +0200
Subject: Remove stale code for hybrid heap and incremental GC

The hybrid heap emulator was last working in the non-SMP R11B
run-time system. When the constant pools were introduced in R12B,
the hybrid heap emulator was not updated to handle them.

At this point, the harm from reduced readability of the code is
greater than any potential usefulness of keeping the code.
---
 erts/Makefile.in | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'erts/Makefile.in')

diff --git a/erts/Makefile.in b/erts/Makefile.in
index 1979c50781..55377c779e 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -31,21 +31,10 @@ ifeq ($(NO_START_SCRIPTS),)
 ERTSDIRS += start_scripts
 endif
 
-# Until hybrid is nofrag, don't build it.
-#BUILD_HYBRID_EMU=@ERTS_BUILD_HYBRID_EMU@
-BUILD_HYBRID_EMU=no
-
 EXTRA_FLAVORS=smp
-ifeq ($(BUILD_HYBRID_EMU),yes)
-EXTRA_FLAVORS += hybrid
-endif
 
 .PHONY: all
-ifneq ($(BUILD_HYBRID_EMU),yes)
 all: smp opt
-else
-all: hybrid smp opt
-endif
 
 .PHONY: docs
 docs:
@@ -68,13 +57,6 @@ debug opt clean:
 $(EXTRA_FLAVORS):
 	( cd emulator && $(MAKE) opt FLAVOR=$@ )
 
-ifneq ($(BUILD_HYBRID_EMU),yes)
-.PHONY: hybrid
-hybrid:
-	@echo '*** Omitted build of hybrid heap emulator'
-	@echo '*** since target is $(TARGET)'
-endif
-
 # Make erl script and erlc in $(ERL_TOP)/bin which runs the compiled version
 # Note that erlc is not a script and requires extra handling on cygwin.
 # also note that this file is not created by autoconf, that's why @EXEEXT@
-- 
cgit v1.2.3