src/cpu/sparc/vm/macroAssembler_sparc.cpp

@@ -355,14 +355,14 @@
 // Calls to C land
 
 #ifdef ASSERT
 // a hook for debugging
 static Thread* reinitialize_thread() {
-  return ThreadLocalStorage::thread();
+    return Thread::current();
 }
 #else
-#define reinitialize_thread ThreadLocalStorage::thread
+#define reinitialize_thread Thread::current
 #endif
 
 #ifdef ASSERT
 address last_get_thread = NULL;
 #endif

@@ -388,11 +388,11 @@
   mov(L5, G4);
   restore(O0, 0, G2_thread);
 }
 
 static Thread* verify_thread_subroutine(Thread* gthread_value) {
-  Thread* correct_value = ThreadLocalStorage::thread();
+    Thread* correct_value = Thread::current();
   guarantee(gthread_value == correct_value, "G2_thread value must be the thread");
   return correct_value;
 }
 
 void MacroAssembler::verify_thread() {