--- old/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.hpp	2009-08-01 04:08:17.089540366 +0100
+++ new/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.hpp	2009-08-01 04:08:17.011908069 +0100
@@ -1,8 +1,5 @@
-#ifdef USE_PRAGMA_IDENT_HDR
-#pragma ident "@(#)stubRoutines_x86_32.hpp	1.71 07/05/05 17:04:20 JVM"
-#endif
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  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
@@ -22,7 +19,7 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
- *  
+ *
  */
 
 // This file holds the platform specific parts of the StubRoutines
@@ -30,11 +27,11 @@
 // extend it.
 
 enum platform_dependent_constants {
-  code_size1 =  9000,		// simply increase if too small (assembler will crash if too small)
-  code_size2 = 22000		// simply increase if too small (assembler will crash if too small)
+  code_size1 =  9000,           // simply increase if too small (assembler will crash if too small)
+  code_size2 = 22000            // simply increase if too small (assembler will crash if too small)
 };
 
-class i486 {
+class x86 {
  friend class StubGenerator;
  friend class VMStructs;
 
@@ -43,7 +40,7 @@
   // need to adjust the return back to the call stub to a specialized
   // piece of code that can handle compiled results and cleaning the fpu
   // stack. The variable holds that location.
-  static address _call_stub_compiled_return;  
+  static address _call_stub_compiled_return;
   static address _verify_mxcsr_entry;
   static address _verify_fpu_cntrl_wrd_entry;
   static jint    _mxcsr_std;
@@ -56,5 +53,5 @@
   static void set_call_stub_compiled_return(address ret)     { _call_stub_compiled_return = ret; }
 };
 
-  static bool    returns_to_call_stub(address return_pc)     { return (return_pc == _call_stub_return_address) || 
-                                                                       return_pc == i486::get_call_stub_compiled_return(); }
+  static bool    returns_to_call_stub(address return_pc)     { return (return_pc == _call_stub_return_address) ||
+                                                                       return_pc == x86::get_call_stub_compiled_return(); }