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/preloaded/src/Makefile | |
| 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/preloaded/src/Makefile')
| -rw-r--r-- | erts/preloaded/src/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index e768a8edbc..e1bd5bc295 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -48,6 +48,8 @@ PRE_LOADED_ERL_MODULES = \ erl_tracer \ erts_literal_area_collector \ erts_dirty_process_signal_handler \ + atomics \ + counters \ persistent_term PRE_LOADED_BEAM_MODULES = \ |