Merge branch 'dev' into major

* dev:
  Move init of smp rw mutex from init to sys_args to make sure that it is initialized before the first erts_sys_getenv call
  Move erts_sys_env_init() to erts_sys_pre_init()
  Remove _DEBUG from start_erl.c
  Spelling correction in erlsrv doc
  Convert windows start_erl to take rootdir on command line
  Add command start_disabled to erlsrv
  Add global lock for erlsrv to avoid races
  Change start order so that service_event gets initialized before it's used

Conflicts:
	erts/emulator/sys/win32/sys.c

1 files changed, 3 insertions, 1 deletions

diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 286fe9ff1e..8a297cded0 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -808,10 +808,12 @@ early_init(int *argc, char **argv) /*
 #if defined(HIPE)
     hipe_signal_init();	/* must be done very early */
 #endif
-    erl_sys_init();
 
     erl_sys_args(argc, argv);
 
+    /* Creates threads on Windows that depend on the arguments, so has to be after erl_sys_args */
+    erl_sys_init();
+
     erts_ets_realloc_always_moves = 0;
     erts_ets_always_compress = 0;
     erts_dist_buf_busy_limit = ERTS_DE_BUSY_LIMIT;