diff options
| author | Björn Gustavsson <[email protected]> | 2012-05-10 12:09:07 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-05-10 17:13:03 +0200 |
| commit | 5c2dad487e6af1a48fa3a1f3d985b6b891788bde (patch) | |
| tree | 48b44d556ee013786bf21babafd138d253e4de08 /erts/emulator/Makefile.in | |
| parent | 422b10bbbd1eb27163d72c2586c2bfb0b2d9c9b2 (diff) | |
| download | otp-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/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 2efbe2d57e..6040308aa7 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -136,13 +136,6 @@ ENABLE_ALLOC_TYPE_VARS += smp nofrag M4FLAGS += -DERTS_SMP=1 else -ifeq ($(FLAVOR),hybrid) -FLAVOR_MARKER=.hybrid -FLAVOR_FLAGS=-DHYBRID -ENABLE_ALLOC_TYPE_VARS += hybrid -else - - # If flavor isn't one of the above, it *is* plain flavor... override FLAVOR=plain FLAVOR_MARKER= @@ -151,7 +144,6 @@ ENABLE_ALLOC_TYPE_VARS += nofrag M4FLAGS += endif -endif TF_MARKER=$(TYPEMARKER)$(FLAVOR_MARKER) @@ -748,7 +740,7 @@ RUN_OBJS = \ $(OBJDIR)/register.o $(OBJDIR)/break.o \ $(OBJDIR)/erl_async.o $(OBJDIR)/erl_lock_check.o \ $(OBJDIR)/erl_gc.o $(OBJDIR)/erl_lock_count.o \ - $(OBJDIR)/erl_nmgc.o $(OBJDIR)/erl_posix_str.o \ + $(OBJDIR)/erl_posix_str.o \ $(OBJDIR)/erl_bits.o $(OBJDIR)/erl_math.o \ $(OBJDIR)/erl_fun.o $(OBJDIR)/erl_bif_port.o \ $(OBJDIR)/erl_term.o $(OBJDIR)/erl_node_tables.o \ |