aboutsummaryrefslogtreecommitdiffstats
path: root/erts/Makefile.in
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-05-10 12:09:07 +0200
committerBjörn Gustavsson <[email protected]>2012-05-10 17:13:03 +0200
commit5c2dad487e6af1a48fa3a1f3d985b6b891788bde (patch)
tree48b44d556ee013786bf21babafd138d253e4de08 /erts/Makefile.in
parent422b10bbbd1eb27163d72c2586c2bfb0b2d9c9b2 (diff)
downloadotp-5c2dad487e6af1a48fa3a1f3d985b6b891788bde.tar.gz
otp-5c2dad487e6af1a48fa3a1f3d985b6b891788bde.tar.bz2
otp-5c2dad487e6af1a48fa3a1f3d985b6b891788bde.zip
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.
Diffstat (limited to 'erts/Makefile.in')
-rw-r--r--erts/Makefile.in18
1 files changed, 0 insertions, 18 deletions
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@