diff options
| author | John Högberg <[email protected]> | 2017-12-01 07:59:41 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-12-01 07:59:41 +0100 |
| commit | 76c4821cff1e91c26dd2f812fc8cb40aa7d48e57 (patch) | |
| tree | 3b2fefd934522721c30735766d82974460809256 /erts/preloaded/src/init.erl | |
| parent | 93cc4a79c3c2bf6eb9489558795da726f141ed06 (diff) | |
| parent | 0278c9873ffc277c9a940d6f5cae1508a6685c7b (diff) | |
| download | otp-76c4821cff1e91c26dd2f812fc8cb40aa7d48e57.tar.gz otp-76c4821cff1e91c26dd2f812fc8cb40aa7d48e57.tar.bz2 otp-76c4821cff1e91c26dd2f812fc8cb40aa7d48e57.zip | |
Merge branch 'john/erts/efile-nif'
OTP-14256
OTP-14797
Diffstat (limited to 'erts/preloaded/src/init.erl')
| -rw-r--r-- | erts/preloaded/src/init.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 34a9f6b8b9..679a2241d2 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -200,10 +200,11 @@ boot(BootArgs) -> register(init, self()), process_flag(trap_exit, true), - %% Load the zlib nif + %% Load the static nifs zlib:on_load(), - %% Load the tracer nif erl_tracer:on_load(), + prim_buffer:on_load(), + prim_file:on_load(), {Start0,Flags,Args} = parse_boot_args(BootArgs), %% We don't get to profile parsing of BootArgs |