diff options
| author | Björn Gustavsson <[email protected]> | 2018-11-06 12:06:32 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-11-06 12:06:32 +0100 |
| commit | abde22933f5a617376d7db9fd91690e901c996ef (patch) | |
| tree | 7efe4f3dd9baf5c48cde8b01481c0ef661bbd780 /lib/sasl/src/systools_make.erl | |
| parent | c2a3104849583a9e1aa5370873457975bef67296 (diff) | |
| parent | adffe592c98149ac3b7333cf6e46970a13a57350 (diff) | |
| download | otp-abde22933f5a617376d7db9fd91690e901c996ef.tar.gz otp-abde22933f5a617376d7db9fd91690e901c996ef.tar.bz2 otp-abde22933f5a617376d7db9fd91690e901c996ef.zip | |
Merge branch 'maint'
* maint:
Implement a tab for persistent terms in crashdump viewer
Add tests of persistent terms for crashdump_viewer
Add a persistent term storage
Refactor releasing of literals
Extend the sharing-preserving routines to optionally copy literals
Conflicts:
erts/emulator/Makefile.in
erts/emulator/beam/erl_process_dump.c
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/init.beam
lib/sasl/src/systools_make.erl
Diffstat (limited to 'lib/sasl/src/systools_make.erl')
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl index a0331fafd1..072d4ed555 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -1565,7 +1565,7 @@ preloaded() -> [erl_init,erl_prim_loader,erl_tracer,erlang, erts_code_purger,erts_dirty_process_signal_handler, erts_internal,erts_literal_area_collector, - init,prim_buffer,prim_eval,prim_file, + init,persistent_term,prim_buffer,prim_eval,prim_file, prim_inet,prim_zip,zlib]. %%______________________________________________________________________ |