diff options
| author | Rickard Green <[email protected]> | 2016-08-29 17:52:10 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-29 17:52:10 +0200 |
| commit | 928d74ffa09bd56652d9390b02fa51ef51d71d51 (patch) | |
| tree | bfb9cd9e76d4ef766dbcd999adf16c700350b399 /lib/sasl | |
| parent | 69d442f8afc67aef33c70d68d7eaab2bdad1400f (diff) | |
| parent | 9d0638216d35ca0f21c1eea20f8daa3992ac4f71 (diff) | |
| download | otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.tar.gz otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.tar.bz2 otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.zip | |
Merge branch 'rickard/fun-purge-bug/OTP-13809' and 'rickard/new-purge-strategy/OTP-13833' into maint
* rickard/fun-purge-bug/OTP-13809:
Fix purge of code
Reclaim literal area after purge has completed
Separate literal area from code
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_init.c
erts/preloaded/ebin/init.beam
Diffstat (limited to 'lib/sasl')
| -rw-r--r-- | lib/sasl/src/sasl.app.src | 2 | ||||
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src index 4ee8a7d6c8..633cdfa070 100644 --- a/lib/sasl/src/sasl.app.src +++ b/lib/sasl/src/sasl.app.src @@ -46,5 +46,5 @@ {errlog_type, all}]}, {mod, {sasl, []}}, {runtime_dependencies, ["tools-2.6.14","stdlib-3.0","kernel-5.0", - "erts-8.0"]}]}. + "erts-8.1"]}]}. diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl index 352e4984df..29fccca741 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -1492,7 +1492,8 @@ preloaded() -> %% Sorted [erl_prim_loader,erl_tracer,erlang, erts_code_purger, - erts_internal,init,otp_ring0,prim_eval,prim_file, + erts_internal,erts_literal_area_collector, + init,otp_ring0,prim_eval,prim_file, prim_inet,prim_zip,zlib]. %%______________________________________________________________________ |