src/share/vm/runtime/threadLocalStorage.hpp

*** 36,49 ****
--- 36,53 ----
  
  // Get raw thread id: e.g., %g7 on sparc, fs or gs on x86
  extern "C" uintptr_t _raw_thread_id();
  
  class ThreadLocalStorage : AllStatic {
+ 
+  // Exported API
   public:
    static void    set_thread(Thread* thread);
    static Thread* get_thread_slow();
    static void    invalidate_all() { pd_invalidate_all(); }
+   static void    init();
+   static bool    is_initialized();
  
    // Machine dependent stuff
  #ifdef TARGET_OS_ARCH_linux_x86
  # include "threadLS_linux_x86.hpp"
  #endif
*** 79,107 ****
  #endif
  #ifdef TARGET_OS_ARCH_bsd_zero
  # include "threadLS_bsd_zero.hpp"
  #endif
  
! 
   public:
    // Accessor
    static inline int  thread_index()              { return _thread_index; }
    static inline void set_thread_index(int index) { _thread_index = index; }
  
-   // Initialization
-   // Called explicitly from VMThread::activate_system instead of init_globals.
-   static void init();
-   static bool is_initialized();
- 
   private:
    static int     _thread_index;
  
    static void    generate_code_for_get_thread();
  
    // Processor dependent parts of set_thread and initialization
    static void pd_set_thread(Thread* thread);
    static void pd_init();
    // Invalidate any thread cacheing or optimization schemes.
    static void pd_invalidate_all();
  
  };
  
--- 83,109 ----
  #endif
  #ifdef TARGET_OS_ARCH_bsd_zero
  # include "threadLS_bsd_zero.hpp"
  #endif
  
! #ifndef SOLARIS
   public:
    // Accessor
    static inline int  thread_index()              { return _thread_index; }
    static inline void set_thread_index(int index) { _thread_index = index; }
  
   private:
    static int     _thread_index;
  
    static void    generate_code_for_get_thread();
  
    // Processor dependent parts of set_thread and initialization
    static void pd_set_thread(Thread* thread);
    static void pd_init();
+ 
+ #endif // SOLARIS
+ 
    // Invalidate any thread cacheing or optimization schemes.
    static void pd_invalidate_all();
  
  };