diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-14 15:22:25 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-14 15:22:25 +0200 |
| commit | 06c111265748b3e6eddc8252af055449d8cb83f4 (patch) | |
| tree | 97bfa8d67618b2e241f9fae3c2fbf6956da6309f /erts/preloaded | |
| parent | 3582e6f420d84ddac64b55cb13100f1ae7f31b08 (diff) | |
| parent | 9eee0bb5cc74d037ce89521b9a1fec4a289e4880 (diff) | |
| download | otp-06c111265748b3e6eddc8252af055449d8cb83f4.tar.gz otp-06c111265748b3e6eddc8252af055449d8cb83f4.tar.bz2 otp-06c111265748b3e6eddc8252af055449d8cb83f4.zip | |
Merge branch 'master' into sverker/hipe-code-loadnpurge
Conflicts:
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/beam_load.c
and added macro DBG_TRACE_MFA_P in beam_load.h
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 50032 -> 50040 bytes | |||
| -rw-r--r-- | erts/preloaded/src/init.erl | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex 849273f746..74a0184818 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 962528f7ab..551ca4ea40 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -205,7 +205,7 @@ boot(BootArgs) -> {Start0,Flags,Args} = parse_boot_args(BootArgs), %% We don't get to profile parsing of BootArgs - case get_flag(profile_boot, Flags, false) of + case b2a(get_flag(profile_boot, Flags, false)) of false -> ok; true -> debug_profile_start() end, @@ -782,7 +782,7 @@ do_boot(Init,Flags,Start) -> (catch erlang:system_info({purify, "Node: " ++ atom_to_list(node())})), start_em(Start), - case get_flag(profile_boot,Flags,false) of + case b2a(get_flag(profile_boot,Flags,false)) of false -> ok; true -> debug_profile_format_mfas(debug_profile_mfas()), |