diff options
| author | Sverker Eriksson <[email protected]> | 2013-10-15 15:19:43 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-10-15 15:19:43 +0200 |
| commit | 356c1e9312a640ac211b6d5d4110372742acfcde (patch) | |
| tree | 1961a33422f0f4bdae6c1bc647b93a2441fe41e0 /erts/emulator/Makefile.in | |
| parent | bbe80d2ad4ef0ca607ba557102212cb7c9a06e2c (diff) | |
| parent | 5db2c05af6efaf636b2e41e3a1f305c592a71f34 (diff) | |
| download | otp-356c1e9312a640ac211b6d5d4110372742acfcde.tar.gz otp-356c1e9312a640ac211b6d5d4110372742acfcde.tar.bz2 otp-356c1e9312a640ac211b6d5d4110372742acfcde.zip | |
Merge branch 'rickard-sverker/supercarrier/OTP-11149' into maint
* rickard-sverker/supercarrier/OTP-11149: (29 commits)
erts: Add test case for erts_mmap
erts: Add mutex to init_atoms in erts_mmap.c
erts: Fix lock violation for init_atoms in erl_mmap.c
erts: Fix misc minor bugs in supercarrier initialization
erts: Add erts_mmap stats
erts: Add erts_bld_tupleX macros
erts: Rename erts_bld_atom_uint_2tup_list to *_uword_*
erts: Fix bug in lookup_free_seg
erts: Fix race bug in erts_munmap
erts: Add HARD_DBG_MSEG
erts: Refactor rbt_insert in erl_mmap
erts: erts_mmap improved free seg desc management
erts: Add documentation for +MMsc* system flags
erts: Allow page aligned erts_munmap()
erts: Sort tree in super aligned sizes (SA_SZ_ADDR_ORDER)
erts: Fix ASSERT bug and void* arithmetics
erts: Add mmap argument to erts_debug:get_internal_state
erts: Improve erts_mmap out of free descriptor management
erts: Cleanup erl_mmap
erts: Add __func__ to ERTS_ASSERT macro
...
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 9751982103..f442540f49 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -808,6 +808,7 @@ OS_OBJS += $(OBJDIR)/erl_poll.o \ endif OS_OBJS += $(OBJDIR)/erl_mseg.o \ + $(OBJDIR)/erl_mmap.o \ $(OBJDIR)/erl_$(ERLANG_OSTYPE)_sys_ddll.o \ $(OBJDIR)/erl_mtrace_sys_wrap.o \ $(OBJDIR)/erl_sys_common_misc.o |