--- a/src/hotspot/share/runtime/thread.cpp	Tue Nov 21 09:04:42 2017 -0800
+++ b/src/hotspot/share/runtime/thread.cpp	Mon Nov 20 10:10:58 2017 +0100
@@ -3559,12 +3559,12 @@
   // Timing (must come after argument parsing)
   TraceTime timer("Create VM", TRACETIME_LOG(Info, startuptime));
 
-  SafepointMechanism::initialize();
-
   // Initialize the os module after parsing the args
   jint os_init_2_result = os::init_2();
   if (os_init_2_result != JNI_OK) return os_init_2_result;
 
+  SafepointMechanism::initialize();
+
   jint adjust_after_os_result = Arguments::adjust_after_os();
   if (adjust_after_os_result != JNI_OK) return adjust_after_os_result;