diff options
| author | Björn Gustavsson <[email protected]> | 2016-02-26 13:09:07 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-02-26 13:09:07 +0100 |
| commit | 6336e0dda8d668c24412775fb45aa8ad19ac384f (patch) | |
| tree | 2e063c4bd6fdea8a5f3e76738bc96ce6ac8fdaf4 /erts/preloaded/ebin | |
| parent | e76103a4549bc25937af5cdccbe43c1683613d07 (diff) | |
| parent | 1703b979ffcbfbe44c9014f28384305fea930511 (diff) | |
| download | otp-6336e0dda8d668c24412775fb45aa8ad19ac384f.tar.gz otp-6336e0dda8d668c24412775fb45aa8ad19ac384f.tar.bz2 otp-6336e0dda8d668c24412775fb45aa8ad19ac384f.zip | |
Merge branch 'bjorn/multiple-load/OTP-13111'
* bjorn/multiple-load/OTP-13111:
code: Add functions that can load multiple modules
Refactor post_beam_load handling
Simplify and robustify code_server:all_loaded/1
Update preloaded modules
Add erl_prim_loader:get_modules/3
Add has_prepared_code_on_load/1 BIF
Allow erlang:finish_loading/1 to load more than one module
beam_load.c: Add a function to check for an on_load function
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 49836 -> 55528 bytes |
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 101968 -> 102148 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex ca9e6bd20f..6d777fa811 100644 --- a/erts/preloaded/ebin/erl_prim_loader.beam +++ b/erts/preloaded/ebin/erl_prim_loader.beam diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex b353129a34..db17c53ff3 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam |