src/share/vm/runtime/thread.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 3388,3404 ****
    VM_Version::early_initialize();
  
    // Check version
    if (!is_supported_jni_version(args->version)) return JNI_EVERSION;
  
    // 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
    os::init();
  
    // Record VM creation timing statistics
    TraceVmCreationTime create_vm_timer;
    create_vm_timer.start();
--- 3388,3407 ----
    VM_Version::early_initialize();
  
    // 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
    os::init();
  
    // Record VM creation timing statistics
    TraceVmCreationTime create_vm_timer;
    create_vm_timer.start();
*** 3449,3461 ****
    if (os_init_2_result != JNI_OK) return os_init_2_result;
  
    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();
  
    // Convert -Xrun to -agentlib: if there is no JVM_OnLoad
    // Must be before create_vm_init_agents()
--- 3452,3461 ----