diff options
| author | Sverker Eriksson <[email protected]> | 2018-11-15 15:48:38 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-11-15 15:48:38 +0100 |
| commit | efe633d2c22daea6225935a2945fa5d3dd70e50c (patch) | |
| tree | 7f111f09a6c261be777831578adb8aad6b970c9e /erts/emulator/Makefile.in | |
| parent | 870ff6a1ec52003b8b67d3bbfaf68a28184bd0b6 (diff) | |
| parent | fefb5d039e87ff7137e78b3d5f2eaf01e498ec4d (diff) | |
| download | otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.gz otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.bz2 otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.zip | |
Merge branch 'sverker/erts/atomics-counters/OTP-13468' into maint
* sverker/erts/atomics-counters/OTP-13468:
erts: Add new module 'counters'
erts: Add new module 'atomics'
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index d5ceb4b00b..57a9d45887 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -648,6 +648,8 @@ PRELOAD_BEAM = $(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \ $(ERL_TOP)/erts/preloaded/ebin/erl_tracer.beam \ $(ERL_TOP)/erts/preloaded/ebin/erts_literal_area_collector.beam \ $(ERL_TOP)/erts/preloaded/ebin/erts_dirty_process_signal_handler.beam \ + $(ERL_TOP)/erts/preloaded/ebin/atomics.beam \ + $(ERL_TOP)/erts/preloaded/ebin/counters.beam \ $(ERL_TOP)/erts/preloaded/ebin/persistent_term.beam ifeq ($(TARGET),win32) @@ -841,6 +843,7 @@ RUN_OBJS += \ $(OBJDIR)/erl_bif_info.o $(OBJDIR)/erl_bif_op.o \ $(OBJDIR)/erl_bif_os.o $(OBJDIR)/erl_bif_lists.o \ $(OBJDIR)/erl_bif_persistent.o \ + $(OBJDIR)/erl_bif_atomics.o $(OBJDIR)/erl_bif_counters.o \ $(OBJDIR)/erl_bif_trace.o $(OBJDIR)/erl_bif_unique.o \ $(OBJDIR)/erl_bif_wrap.o $(OBJDIR)/erl_nfunc_sched.o \ $(OBJDIR)/erl_guard_bifs.o $(OBJDIR)/erl_dirty_bif_wrap.o \ |