diff options
| author | Lukas Larsson <[email protected]> | 2018-10-01 12:00:23 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-10-01 12:00:23 +0200 |
| commit | 71a6e006f71e14e3a67d64b5acfec2875cdc3e32 (patch) | |
| tree | b7ae3e2756056285fea5369743e8fa9e06d21275 /erts/preloaded/src/Makefile | |
| parent | b7f129755def52f2d321faf956e8dd3015418972 (diff) | |
| parent | 354dac67d0a81edcdb9f8c49b2299a350af6e498 (diff) | |
| download | otp-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/Makefile')
| -rw-r--r-- | erts/preloaded/src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 4333f6643a..3c8d75b205 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -41,7 +41,7 @@ PRE_LOADED_ERL_MODULES = \ prim_inet \ zlib \ prim_zip \ - otp_ring0 \ + erl_init \ erts_code_purger \ erlang \ erts_internal \ |