aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/erts.app.src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-10-01 12:00:23 +0200
committerLukas Larsson <[email protected]>2018-10-01 12:00:23 +0200
commit71a6e006f71e14e3a67d64b5acfec2875cdc3e32 (patch)
treeb7ae3e2756056285fea5369743e8fa9e06d21275 /erts/preloaded/src/erts.app.src
parentb7f129755def52f2d321faf956e8dd3015418972 (diff)
parent354dac67d0a81edcdb9f8c49b2299a350af6e498 (diff)
downloadotp-71a6e006f71e14e3a67d64b5acfec2875cdc3e32.tar.gz
otp-71a6e006f71e14e3a67d64b5acfec2875cdc3e32.tar.bz2
otp-71a6e006f71e14e3a67d64b5acfec2875cdc3e32.zip
Merge branch 'richcarl/erts/erl_init-cleanup/OTP-15336'
* richcarl/erts/erl_init-cleanup/OTP-15336: sasl: Order systools_make:preloaded modules alphabetically Update preloaded modules Move calling on_load for preloaded modules to erl_init Make erl_init.c pass the boot module to erl_init.beam Remove obsolete comment text Remove undocumented and unused -# display_items emulator option Remove broken and undocumented boot function emulator option Replace remaining references to otp_ring0 with erl_init Drop otp_ring0, using erl_init instead Update preloaded modules Add erl_init module Conflicts: erts/emulator/beam/erl_init.c erts/preloaded/ebin/erl_prim_loader.beam erts/preloaded/ebin/erl_tracer.beam erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_code_purger.beam erts/preloaded/ebin/erts_dirty_process_signal_handler.beam erts/preloaded/ebin/erts_internal.beam erts/preloaded/ebin/erts_literal_area_collector.beam erts/preloaded/ebin/init.beam erts/preloaded/ebin/otp_ring0.beam erts/preloaded/ebin/prim_buffer.beam erts/preloaded/ebin/prim_eval.beam erts/preloaded/ebin/prim_file.beam erts/preloaded/ebin/prim_inet.beam erts/preloaded/ebin/prim_zip.beam erts/preloaded/ebin/zlib.beam
Diffstat (limited to 'erts/preloaded/src/erts.app.src')
-rw-r--r--erts/preloaded/src/erts.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 8c34c99a98..dc97b86d8c 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -26,7 +26,7 @@
erl_prim_loader,
erts_internal,
init,
- otp_ring0,
+ erl_init,
erts_code_purger,
prim_buffer,
prim_eval,