diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-29 17:42:02 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-29 17:42:02 +0200 |
| commit | 07936436b8a8b18b80451a09e040283ebecbd43b (patch) | |
| tree | 351efbc05604fa0df288662f9071bd8912954d0c /erts/emulator/Makefile.in | |
| parent | 388bb54ba7128c1242c3fbee8a45168bd20110a4 (diff) | |
| parent | 94ad6bd0aec9dd41b1bb4d789df313ddcad5af5b (diff) | |
| download | otp-07936436b8a8b18b80451a09e040283ebecbd43b.tar.gz otp-07936436b8a8b18b80451a09e040283ebecbd43b.tar.bz2 otp-07936436b8a8b18b80451a09e040283ebecbd43b.zip | |
Merge branch 'sverker/allocator-aoff/OTP-9424' into dev
* sverker/allocator-aoff/OTP-9424:
New allocator: Address order first fit (aoff)
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index d9362a2a8f..b658e79378 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -742,7 +742,7 @@ RUN_OBJS = \ $(OBJDIR)/erl_bif_re.o $(OBJDIR)/erl_unicode.o \ $(OBJDIR)/packet_parser.o $(OBJDIR)/safe_hash.o \ $(OBJDIR)/erl_zlib.o $(OBJDIR)/erl_nif.o \ - $(OBJDIR)/erl_bif_binary.o + $(OBJDIR)/erl_bif_binary.o $(OBJDIR)/erl_ao_firstfit_alloc.o ifeq ($(TARGET),win32) DRV_OBJS = \ |