aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-11-15 15:48:38 +0100
committerSverker Eriksson <[email protected]>2018-11-15 15:48:38 +0100
commitefe633d2c22daea6225935a2945fa5d3dd70e50c (patch)
tree7f111f09a6c261be777831578adb8aad6b970c9e /lib/sasl
parent870ff6a1ec52003b8b67d3bbfaf68a28184bd0b6 (diff)
parentfefb5d039e87ff7137e78b3d5f2eaf01e498ec4d (diff)
downloadotp-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 'lib/sasl')
-rw-r--r--lib/sasl/src/sasl.app.src2
-rw-r--r--lib/sasl/src/systools_make.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src
index 688aff16f1..5d45af0b50 100644
--- a/lib/sasl/src/sasl.app.src
+++ b/lib/sasl/src/sasl.app.src
@@ -43,5 +43,5 @@
{env, []},
{mod, {sasl, []}},
{runtime_dependencies, ["tools-2.6.14","stdlib-3.4","kernel-5.3",
- "erts-9.0"]}]}.
+ "erts-@OTP-13468@"]}]}.
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 983df58ef7..f085246924 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1562,7 +1562,7 @@ mandatory_modules() ->
preloaded() ->
%% Sorted
- [erl_prim_loader,erl_tracer,erlang,
+ [atomics, counters, erl_prim_loader,erl_tracer,erlang,
erts_code_purger,erts_dirty_process_signal_handler,
erts_internal,erts_literal_area_collector,
init,otp_ring0,persistent_term,prim_buffer,prim_eval,prim_file,