From 98f88c7d90033d9602be4b73c9f31c7f027f51c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 28 Nov 2018 12:22:27 +0100 Subject: Update primary bootstrap --- bootstrap/bin/no_dot_erlang.boot | Bin 6374 -> 6484 bytes bootstrap/bin/start.boot | Bin 6374 -> 6484 bytes bootstrap/bin/start_clean.boot | Bin 6374 -> 6484 bytes bootstrap/lib/compiler/ebin/beam_asm.beam | Bin 11328 -> 11328 bytes bootstrap/lib/compiler/ebin/beam_jump.beam | Bin 9132 -> 9276 bytes bootstrap/lib/compiler/ebin/beam_type.beam | Bin 18744 -> 18728 bytes bootstrap/lib/compiler/ebin/beam_utils.beam | Bin 22624 -> 22904 bytes bootstrap/lib/compiler/ebin/beam_validator.beam | Bin 31848 -> 32176 bytes bootstrap/lib/compiler/ebin/compile.beam | Bin 41384 -> 41552 bytes bootstrap/lib/compiler/ebin/compiler.app | 2 +- bootstrap/lib/compiler/ebin/sys_core_bsm.beam | Bin 5120 -> 5584 bytes bootstrap/lib/compiler/ebin/sys_core_fold.beam | Bin 47536 -> 49380 bytes bootstrap/lib/compiler/ebin/v3_codegen.beam | Bin 65424 -> 65252 bytes bootstrap/lib/compiler/ebin/v3_core.beam | Bin 57676 -> 58180 bytes bootstrap/lib/kernel/ebin/error_logger.beam | Bin 6132 -> 6432 bytes bootstrap/lib/kernel/ebin/hipe_unified_loader.beam | Bin 12500 -> 12500 bytes bootstrap/lib/kernel/ebin/inet.beam | Bin 23632 -> 24196 bytes bootstrap/lib/kernel/ebin/inet6_tcp.beam | Bin 2988 -> 3120 bytes bootstrap/lib/kernel/ebin/inet_tcp.beam | Bin 2680 -> 2820 bytes bootstrap/lib/kernel/ebin/inet_tcp_dist.beam | Bin 7700 -> 7708 bytes bootstrap/lib/kernel/ebin/kernel.app | 8 +++++--- bootstrap/lib/kernel/ebin/logger.beam | Bin 11312 -> 11976 bytes bootstrap/lib/kernel/ebin/logger_backend.beam | Bin 2620 -> 2632 bytes bootstrap/lib/kernel/ebin/logger_config.beam | Bin 3428 -> 3028 bytes bootstrap/lib/kernel/ebin/logger_disk_log_h.beam | Bin 9460 -> 9904 bytes bootstrap/lib/kernel/ebin/logger_formatter.beam | Bin 7796 -> 9060 bytes bootstrap/lib/kernel/ebin/logger_h_common.beam | Bin 5672 -> 5784 bytes .../lib/kernel/ebin/logger_handler_watcher.beam | Bin 0 -> 1372 bytes bootstrap/lib/kernel/ebin/logger_server.beam | Bin 10476 -> 11612 bytes bootstrap/lib/kernel/ebin/logger_std_h.beam | Bin 10872 -> 11208 bytes bootstrap/lib/kernel/ebin/logger_sup.beam | Bin 524 -> 576 bytes bootstrap/lib/kernel/ebin/net_kernel.beam | Bin 25644 -> 25304 bytes bootstrap/lib/kernel/include/dist.hrl | 2 +- bootstrap/lib/kernel/include/dist_util.hrl | 2 +- bootstrap/lib/kernel/include/logger.hrl | 4 ++++ bootstrap/lib/stdlib/ebin/beam_lib.beam | Bin 19436 -> 19612 bytes bootstrap/lib/stdlib/ebin/dets.beam | Bin 48916 -> 48944 bytes bootstrap/lib/stdlib/ebin/epp.beam | Bin 29720 -> 29748 bytes bootstrap/lib/stdlib/ebin/erl_eval.beam | Bin 35988 -> 36256 bytes bootstrap/lib/stdlib/ebin/erl_internal.beam | Bin 7808 -> 7796 bytes bootstrap/lib/stdlib/ebin/erl_lint.beam | Bin 91872 -> 91808 bytes bootstrap/lib/stdlib/ebin/io_lib.beam | Bin 13444 -> 13828 bytes bootstrap/lib/stdlib/ebin/io_lib_format.beam | Bin 14840 -> 14876 bytes bootstrap/lib/stdlib/ebin/io_lib_pretty.beam | Bin 21956 -> 22016 bytes bootstrap/lib/stdlib/ebin/ms_transform.beam | Bin 19532 -> 19544 bytes bootstrap/lib/stdlib/ebin/proc_lib.beam | Bin 12448 -> 13036 bytes bootstrap/lib/stdlib/ebin/stdlib.app | 2 +- 47 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 bootstrap/lib/kernel/ebin/logger_handler_watcher.beam diff --git a/bootstrap/bin/no_dot_erlang.boot b/bootstrap/bin/no_dot_erlang.boot index 127072b3ed..d3efecd3d9 100644 Binary files a/bootstrap/bin/no_dot_erlang.boot and b/bootstrap/bin/no_dot_erlang.boot differ diff --git a/bootstrap/bin/start.boot b/bootstrap/bin/start.boot index 127072b3ed..d3efecd3d9 100644 Binary files a/bootstrap/bin/start.boot and b/bootstrap/bin/start.boot differ diff --git a/bootstrap/bin/start_clean.boot b/bootstrap/bin/start_clean.boot index 127072b3ed..d3efecd3d9 100644 Binary files a/bootstrap/bin/start_clean.boot and b/bootstrap/bin/start_clean.boot differ diff --git a/bootstrap/lib/compiler/ebin/beam_asm.beam b/bootstrap/lib/compiler/ebin/beam_asm.beam index c0db0d1ac4..03eb4986e4 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_asm.beam and b/bootstrap/lib/compiler/ebin/beam_asm.beam differ diff --git a/bootstrap/lib/compiler/ebin/beam_jump.beam b/bootstrap/lib/compiler/ebin/beam_jump.beam index 6af8a015c0..a77c5caf36 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_jump.beam and b/bootstrap/lib/compiler/ebin/beam_jump.beam differ diff --git a/bootstrap/lib/compiler/ebin/beam_type.beam b/bootstrap/lib/compiler/ebin/beam_type.beam index 266c04acfd..fe2824b20e 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_type.beam and b/bootstrap/lib/compiler/ebin/beam_type.beam differ diff --git a/bootstrap/lib/compiler/ebin/beam_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam index 5648719621..7c65d7b6e4 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_utils.beam and b/bootstrap/lib/compiler/ebin/beam_utils.beam differ diff --git a/bootstrap/lib/compiler/ebin/beam_validator.beam b/bootstrap/lib/compiler/ebin/beam_validator.beam index 2bcec9ca3c..6d2c9eb69d 100644 Binary files a/bootstrap/lib/compiler/ebin/beam_validator.beam and b/bootstrap/lib/compiler/ebin/beam_validator.beam differ diff --git a/bootstrap/lib/compiler/ebin/compile.beam b/bootstrap/lib/compiler/ebin/compile.beam index d1a9058417..3f52b9463d 100644 Binary files a/bootstrap/lib/compiler/ebin/compile.beam and b/bootstrap/lib/compiler/ebin/compile.beam differ diff --git a/bootstrap/lib/compiler/ebin/compiler.app b/bootstrap/lib/compiler/ebin/compiler.app index 1506292674..f53cc32c12 100644 --- a/bootstrap/lib/compiler/ebin/compiler.app +++ b/bootstrap/lib/compiler/ebin/compiler.app @@ -19,7 +19,7 @@ {application, compiler, [{description, "ERTS CXC 138 10"}, - {vsn, "7.1.5"}, + {vsn, "7.2.7"}, {modules, [ beam_a, beam_asm, diff --git a/bootstrap/lib/compiler/ebin/sys_core_bsm.beam b/bootstrap/lib/compiler/ebin/sys_core_bsm.beam index d14579410c..0bc7588ab3 100644 Binary files a/bootstrap/lib/compiler/ebin/sys_core_bsm.beam and b/bootstrap/lib/compiler/ebin/sys_core_bsm.beam differ diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam index 073bb041d4..9def7c8d2c 100644 Binary files a/bootstrap/lib/compiler/ebin/sys_core_fold.beam and b/bootstrap/lib/compiler/ebin/sys_core_fold.beam differ diff --git a/bootstrap/lib/compiler/ebin/v3_codegen.beam b/bootstrap/lib/compiler/ebin/v3_codegen.beam index c537f1e550..4700b80b93 100644 Binary files a/bootstrap/lib/compiler/ebin/v3_codegen.beam and b/bootstrap/lib/compiler/ebin/v3_codegen.beam differ diff --git a/bootstrap/lib/compiler/ebin/v3_core.beam b/bootstrap/lib/compiler/ebin/v3_core.beam index 162105c0bf..6a76fba69a 100644 Binary files a/bootstrap/lib/compiler/ebin/v3_core.beam and b/bootstrap/lib/compiler/ebin/v3_core.beam differ diff --git a/bootstrap/lib/kernel/ebin/error_logger.beam b/bootstrap/lib/kernel/ebin/error_logger.beam index 8dd3c07f71..08ec3e0e1a 100644 Binary files a/bootstrap/lib/kernel/ebin/error_logger.beam and b/bootstrap/lib/kernel/ebin/error_logger.beam differ diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam index 989fceaa2c..7f205de75f 100644 Binary files a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam and b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam differ diff --git a/bootstrap/lib/kernel/ebin/inet.beam b/bootstrap/lib/kernel/ebin/inet.beam index 7df45ea492..cece8e6e85 100644 Binary files a/bootstrap/lib/kernel/ebin/inet.beam and b/bootstrap/lib/kernel/ebin/inet.beam differ diff --git a/bootstrap/lib/kernel/ebin/inet6_tcp.beam b/bootstrap/lib/kernel/ebin/inet6_tcp.beam index db0ead9cdd..b2dc48d794 100644 Binary files a/bootstrap/lib/kernel/ebin/inet6_tcp.beam and b/bootstrap/lib/kernel/ebin/inet6_tcp.beam differ diff --git a/bootstrap/lib/kernel/ebin/inet_tcp.beam b/bootstrap/lib/kernel/ebin/inet_tcp.beam index 304272a20d..5e3d9b307b 100644 Binary files a/bootstrap/lib/kernel/ebin/inet_tcp.beam and b/bootstrap/lib/kernel/ebin/inet_tcp.beam differ diff --git a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam index c33a9e7f3a..fdfe042445 100644 Binary files a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam and b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam differ diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app index 340ed8653f..898ed0a048 100644 --- a/bootstrap/lib/kernel/ebin/kernel.app +++ b/bootstrap/lib/kernel/ebin/kernel.app @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2017. All Rights Reserved. +%% Copyright Ericsson AB 1996-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ {application, kernel, [ {description, "ERTS CXC 138 10"}, - {vsn, "5.4.3"}, + {vsn, "6.1"}, {modules, [application, application_controller, application_master, @@ -67,6 +67,7 @@ logger_filters, logger_formatter, logger_h_common, + logger_handler_watcher, logger_server, logger_simple_h, logger_std_h, @@ -129,6 +130,7 @@ kernel_refc, kernel_sup, logger, + logger_handler_watcher, logger_sup, net_kernel, net_sup, @@ -144,6 +146,6 @@ {logger_sasl_compatible, false} ]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-10.0", "stdlib-3.5", "sasl-3.0"]} + {runtime_dependencies, ["erts-10.1", "stdlib-3.5", "sasl-3.0"]} ] }. diff --git a/bootstrap/lib/kernel/ebin/logger.beam b/bootstrap/lib/kernel/ebin/logger.beam index e6d8f5b2c6..26e0d3b0f1 100644 Binary files a/bootstrap/lib/kernel/ebin/logger.beam and b/bootstrap/lib/kernel/ebin/logger.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_backend.beam b/bootstrap/lib/kernel/ebin/logger_backend.beam index be448bd75c..b2e7854689 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_backend.beam and b/bootstrap/lib/kernel/ebin/logger_backend.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_config.beam b/bootstrap/lib/kernel/ebin/logger_config.beam index 52f7847561..2d1d9f9919 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_config.beam and b/bootstrap/lib/kernel/ebin/logger_config.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam b/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam index cc1b649eb7..094ca34dc4 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam and b/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_formatter.beam b/bootstrap/lib/kernel/ebin/logger_formatter.beam index 7f7d77ab28..3e99f7e1fa 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_formatter.beam and b/bootstrap/lib/kernel/ebin/logger_formatter.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_h_common.beam b/bootstrap/lib/kernel/ebin/logger_h_common.beam index 7d96f2d69e..e232c87059 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_h_common.beam and b/bootstrap/lib/kernel/ebin/logger_h_common.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_handler_watcher.beam b/bootstrap/lib/kernel/ebin/logger_handler_watcher.beam new file mode 100644 index 0000000000..44bc104ff9 Binary files /dev/null and b/bootstrap/lib/kernel/ebin/logger_handler_watcher.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_server.beam b/bootstrap/lib/kernel/ebin/logger_server.beam index 4885c0992a..c7c9b11962 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_server.beam and b/bootstrap/lib/kernel/ebin/logger_server.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_std_h.beam b/bootstrap/lib/kernel/ebin/logger_std_h.beam index e8c3bb83d0..aa4bd9b218 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_std_h.beam and b/bootstrap/lib/kernel/ebin/logger_std_h.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_sup.beam b/bootstrap/lib/kernel/ebin/logger_sup.beam index 9bef3c861c..32eb526a09 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_sup.beam and b/bootstrap/lib/kernel/ebin/logger_sup.beam differ diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam index 0a565d542d..a62690e27a 100644 Binary files a/bootstrap/lib/kernel/ebin/net_kernel.beam and b/bootstrap/lib/kernel/ebin/net_kernel.beam differ diff --git a/bootstrap/lib/kernel/include/dist.hrl b/bootstrap/lib/kernel/include/dist.hrl index 6baaa35d72..003852f1b0 100644 --- a/bootstrap/lib/kernel/include/dist.hrl +++ b/bootstrap/lib/kernel/include/dist.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2016. All Rights Reserved. +%% Copyright Ericsson AB 1999-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/bootstrap/lib/kernel/include/dist_util.hrl b/bootstrap/lib/kernel/include/dist_util.hrl index eeb0f8dd43..56f775f060 100644 --- a/bootstrap/lib/kernel/include/dist_util.hrl +++ b/bootstrap/lib/kernel/include/dist_util.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2016. All Rights Reserved. +%% Copyright Ericsson AB 1999-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. diff --git a/bootstrap/lib/kernel/include/logger.hrl b/bootstrap/lib/kernel/include/logger.hrl index 2143ccd297..b09977e0f2 100644 --- a/bootstrap/lib/kernel/include/logger.hrl +++ b/bootstrap/lib/kernel/include/logger.hrl @@ -32,6 +32,10 @@ -define(LOG_DEBUG(A,B),?DO_LOG(debug,[A,B])). -define(LOG_DEBUG(A,B,C),?DO_LOG(debug,[A,B,C])). +-define(LOG(L,A),?DO_LOG(L,[A])). +-define(LOG(L,A,B),?DO_LOG(L,[A,B])). +-define(LOG(L,A,B,C),?DO_LOG(L,[A,B,C])). + -define(LOCATION,#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY}, line=>?LINE, file=>?FILE}). diff --git a/bootstrap/lib/stdlib/ebin/beam_lib.beam b/bootstrap/lib/stdlib/ebin/beam_lib.beam index b17a9b1947..ee20aced6b 100644 Binary files a/bootstrap/lib/stdlib/ebin/beam_lib.beam and b/bootstrap/lib/stdlib/ebin/beam_lib.beam differ diff --git a/bootstrap/lib/stdlib/ebin/dets.beam b/bootstrap/lib/stdlib/ebin/dets.beam index 05b575cd05..a7500207db 100644 Binary files a/bootstrap/lib/stdlib/ebin/dets.beam and b/bootstrap/lib/stdlib/ebin/dets.beam differ diff --git a/bootstrap/lib/stdlib/ebin/epp.beam b/bootstrap/lib/stdlib/ebin/epp.beam index c87665ff86..dba73e824b 100644 Binary files a/bootstrap/lib/stdlib/ebin/epp.beam and b/bootstrap/lib/stdlib/ebin/epp.beam differ diff --git a/bootstrap/lib/stdlib/ebin/erl_eval.beam b/bootstrap/lib/stdlib/ebin/erl_eval.beam index eea70718c8..4d96a82267 100644 Binary files a/bootstrap/lib/stdlib/ebin/erl_eval.beam and b/bootstrap/lib/stdlib/ebin/erl_eval.beam differ diff --git a/bootstrap/lib/stdlib/ebin/erl_internal.beam b/bootstrap/lib/stdlib/ebin/erl_internal.beam index c571d9f6f3..0b56862c57 100644 Binary files a/bootstrap/lib/stdlib/ebin/erl_internal.beam and b/bootstrap/lib/stdlib/ebin/erl_internal.beam differ diff --git a/bootstrap/lib/stdlib/ebin/erl_lint.beam b/bootstrap/lib/stdlib/ebin/erl_lint.beam index 3fa4a49c24..ce99e04342 100644 Binary files a/bootstrap/lib/stdlib/ebin/erl_lint.beam and b/bootstrap/lib/stdlib/ebin/erl_lint.beam differ diff --git a/bootstrap/lib/stdlib/ebin/io_lib.beam b/bootstrap/lib/stdlib/ebin/io_lib.beam index a6403bb708..05894640cb 100644 Binary files a/bootstrap/lib/stdlib/ebin/io_lib.beam and b/bootstrap/lib/stdlib/ebin/io_lib.beam differ diff --git a/bootstrap/lib/stdlib/ebin/io_lib_format.beam b/bootstrap/lib/stdlib/ebin/io_lib_format.beam index a1acea2cee..9b8d7d8a9e 100644 Binary files a/bootstrap/lib/stdlib/ebin/io_lib_format.beam and b/bootstrap/lib/stdlib/ebin/io_lib_format.beam differ diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam index dc91c318c5..bd65ecfc30 100644 Binary files a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam and b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam differ diff --git a/bootstrap/lib/stdlib/ebin/ms_transform.beam b/bootstrap/lib/stdlib/ebin/ms_transform.beam index e465ca8d5d..ae3550872f 100644 Binary files a/bootstrap/lib/stdlib/ebin/ms_transform.beam and b/bootstrap/lib/stdlib/ebin/ms_transform.beam differ diff --git a/bootstrap/lib/stdlib/ebin/proc_lib.beam b/bootstrap/lib/stdlib/ebin/proc_lib.beam index ce36bcf6fc..45f25d7820 100644 Binary files a/bootstrap/lib/stdlib/ebin/proc_lib.beam and b/bootstrap/lib/stdlib/ebin/proc_lib.beam differ diff --git a/bootstrap/lib/stdlib/ebin/stdlib.app b/bootstrap/lib/stdlib/ebin/stdlib.app index 20c978670e..d660046c77 100644 --- a/bootstrap/lib/stdlib/ebin/stdlib.app +++ b/bootstrap/lib/stdlib/ebin/stdlib.app @@ -20,7 +20,7 @@ %% {application, stdlib, [{description, "ERTS CXC 138 10"}, - {vsn, "3.4.5"}, + {vsn, "3.6"}, {modules, [array, base64, beam_lib, -- cgit v1.2.3