--- a/hotspot/src/os_cpu/solaris_sparc/vm/solaris_sparc.s	Fri Apr 11 09:56:35 2008 -0400
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/solaris_sparc.s	Sun Apr 13 17:43:42 2008 -0400
@@ -33,7 +33,9 @@
     !! by the .il "call", in some cases optimizing the code, completely eliding it,
     !! or by moving the code from the "call site". 
         
-
+     !! ASM better know we may use G6 for our own purposes
+    .register %g6, #ignore
+        
     .globl  SafeFetch32
     .align  32
     .global Fetch32PFI, Fetch32Resume 
@@ -106,6 +108,7 @@
     .globl _raw_thread_id
     .align 32
  _raw_thread_id:
+    .register %g7, #scratch
         retl
         mov     %g7, %o0