--- a/hotspot/src/cpu/x86/vm/relocInfo_x86.hpp	Wed May 21 10:45:07 2008 -0700
+++ b/hotspot/src/cpu/x86/vm/relocInfo_x86.hpp	Wed May 21 13:46:23 2008 -0700
@@ -29,5 +29,10 @@
     offset_unit        =  1,
 
     // Encodes Assembler::disp32_operand vs. Assembler::imm32_operand.
+#ifndef AMD64
     format_width       =  1
+#else
+    // vs Assembler::narrow_oop_operand.
+    format_width       =  2
+#endif
   };