--- a/hotspot/src/share/vm/runtime/thread.cpp	Sat Jan 09 02:23:04 2016 +0000
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Sun Jan 10 20:02:50 2016 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3390,13 +3390,16 @@
   // Check version
   if (!is_supported_jni_version(args->version)) return JNI_EVERSION;
 
+  // Initialize library-based TLS
+  ThreadLocalStorage::init();
+
   // Initialize the output stream module
   ostream_init();
 
   // Process java launcher properties.
   Arguments::process_sun_java_launcher_properties(args);
 
-  // Initialize the os module before using TLS
+  // Initialize the os module
   os::init();
 
   // Record VM creation timing statistics
@@ -3451,9 +3454,6 @@
   jint adjust_after_os_result = Arguments::adjust_after_os();
   if (adjust_after_os_result != JNI_OK) return adjust_after_os_result;
 
-  // Initialize library-based TLS
-  ThreadLocalStorage::init();
-
   // Initialize output stream logging
   ostream_init_log();