src/share/vm/runtime/threadLocalStorage.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, 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, 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.
*** 25,34 ****
--- 25,39 ----
  #include "precompiled.hpp"
  #include "runtime/os.inline.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/threadLocalStorage.hpp"
  
+ // Solaris no longer has this kind of ThreadLocalStorage implementation.
+ // This will be removed from all platforms in the near future.
+ 
+ #ifndef SOLARIS
+ 
  // static member initialization
  int ThreadLocalStorage::_thread_index = -1;
  
  Thread* ThreadLocalStorage::get_thread_slow() {
    return (Thread*) os::thread_local_storage_at(ThreadLocalStorage::thread_index());
*** 52,56 ****
--- 57,63 ----
  }
  
  bool ThreadLocalStorage::is_initialized() {
      return (thread_index() != -1);
  }
+ 
+ #endif // SOLARIS