diff options
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 1 | ||||
| -rw-r--r-- | erts/etc/common/dialyzer.c | 9 | ||||
| -rw-r--r-- | erts/test/erlc_SUITE.erl | 2 | ||||
| -rw-r--r-- | erts/vsn.mk | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 47dd98117d..99fab28dce 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -5090,6 +5090,7 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info) code[MI_COMPILE_PTR] = 0; code[MI_COMPILE_SIZE_ON_HEAP] = 0; code[MI_NUM_BREAKPOINTS] = 0; + code[MI_ON_LOAD_FUNCTION_PTR] = 0; ci = MI_FUNCTIONS + n + 1; /* diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c index 9c66be7f0f..4b4c1124f1 100644 --- a/erts/etc/common/dialyzer.c +++ b/erts/etc/common/dialyzer.c @@ -141,6 +141,7 @@ main(int argc, char** argv) int eargc_base; /* How many arguments in the base of eargv. */ char* emulator; char *env; + int i; int need_shell = 0; env = get_env("DIALYZER_EMULATOR"); @@ -167,9 +168,11 @@ main(int argc, char** argv) * Push initial arguments. */ - if (argc > 1 && strcmp(argv[1], "--wx") == 0) { - PUSH2("-smp", "--wx"); /* wx currently requires SMP enabled */ - argc--, argv++; + for (i = 1; i < argc; i++) { + if (strcmp(argv[i], "--wx") == 0) { + PUSH("-smp"); /* wx currently requires SMP enabled */ + break; + } } if (argc > 1 && strcmp(argv[1], "-smp") == 0) { diff --git a/erts/test/erlc_SUITE.erl b/erts/test/erlc_SUITE.erl index ce64ef1a75..1d944811aa 100644 --- a/erts/test/erlc_SUITE.erl +++ b/erts/test/erlc_SUITE.erl @@ -117,7 +117,7 @@ compile_mib(Config) when is_list(Config) -> ?line case test_server:os_type() of {unix,_} -> ?line run(Config, Cmd, FileName, "-W +'{verbosity,info}'", - ["GOOD-MIB.mib: Info. No accessfunction for 'sysDescr'", + ["\\[GOOD-MIB[.]mib\\]\\[INF\\]: No accessfunction for 'sysDescr' => using default", "_OK_"]), ?line true = exists(Output), ?line ok = file:delete(Output); diff --git a/erts/vsn.mk b/erts/vsn.mk index 199b1cbf22..8f940339df 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,8 +17,8 @@ # %CopyrightEnd% # -VSN = 5.7.4 -SYSTEM_VSN = R13B03 +VSN = 5.7.5 +SYSTEM_VSN = R13B04 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |