diff options
| author | Rickard Green <[email protected]> | 2013-07-10 15:08:16 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-07-10 15:08:16 +0200 |
| commit | a8e229046356fadaa217d1a1606fde750d1e8aa1 (patch) | |
| tree | 82600f7c06ddbacb0e976989b9251171a2658097 /erts/emulator/beam/erl_init.c | |
| parent | 393a6c033b7291679eab525cd599024de8b28eec (diff) | |
| parent | 75f57c5f9a3bd03cb16e1663d40ea98bbb3ed487 (diff) | |
| download | otp-a8e229046356fadaa217d1a1606fde750d1e8aa1.tar.gz otp-a8e229046356fadaa217d1a1606fde750d1e8aa1.tar.bz2 otp-a8e229046356fadaa217d1a1606fde750d1e8aa1.zip | |
Merge branch 'maint'
* maint:
Add test cases for native atomics and jump table
Refuse to build SMP runtime by default without native atomics
Make information about use of jump table available via system_info BIF
Make ethread library information available via system_info BIF
Make emulator arguments available via the system_info BIF
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 4bae3dfeb4..8d137df7ae 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -637,6 +637,8 @@ early_init(int *argc, char **argv) /* char envbuf[21]; /* enough for any 64-bit integer */ size_t envbufsz; + erts_save_emu_args(*argc, argv); + erts_sched_compact_load = 1; erts_printf_eterm_func = erts_printf_term; erts_disable_tolerant_timeofday = 0; |