diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-06-27 17:03:54 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-03-12 17:16:05 +0100 |
| commit | 8d3dba44bc2ac5ff9e724e90aa832854280b7d1e (patch) | |
| tree | 7c5d414977da3901064e6de018f5420ca54bb9b9 /erts/emulator/Makefile.in | |
| parent | 6d521dae843ee098e823e1c4a3bb2e426409dcea (diff) | |
| download | otp-8d3dba44bc2ac5ff9e724e90aa832854280b7d1e.tar.gz otp-8d3dba44bc2ac5ff9e724e90aa832854280b7d1e.tar.bz2 otp-8d3dba44bc2ac5ff9e724e90aa832854280b7d1e.zip | |
Initial Persistent HAMT - Map framework
Conflicts:
erts/emulator/Makefile.in
erts/emulator/beam/bif.tab
erts/emulator/beam/erl_gc.c
erts/emulator/beam/erl_gc.h
erts/emulator/beam/erl_printf_term.c
erts/emulator/beam/erl_term.c
erts/emulator/beam/erl_term.h
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index a632faf57d..db7eac4690 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -785,7 +785,8 @@ RUN_OBJS = \ $(OBJDIR)/erl_zlib.o $(OBJDIR)/erl_nif.o \ $(OBJDIR)/erl_bif_binary.o $(OBJDIR)/erl_ao_firstfit_alloc.o \ $(OBJDIR)/erl_thr_queue.o $(OBJDIR)/erl_sched_spec_pre_alloc.o \ - $(OBJDIR)/erl_ptab.o $(OBJDIR)/erl_map.o + $(OBJDIR)/erl_ptab.o $(OBJDIR)/erl_map.o \ + $(OBJDIR)/erl_hashmap.o ifeq ($(TARGET),win32) DRV_OBJS = \ |