--- a/hotspot/src/cpu/x86/vm/c1_LinearScan_x86.hpp	Tue Sep 20 16:34:45 2016 -0400
+++ b/hotspot/src/cpu/x86/vm/c1_LinearScan_x86.hpp	Tue Sep 20 16:50:37 2016 -0700
@@ -100,9 +100,11 @@
 
 inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
   int last_xmm_reg = pd_last_xmm_reg;
+#ifdef _LP64
   if (UseAVX < 3) {
     last_xmm_reg = pd_first_xmm_reg + (pd_nof_xmm_regs_frame_map / 2) - 1;
   }
+#endif
   if (allocator()->gen()->is_vreg_flag_set(cur->reg_num(), LIRGenerator::byte_reg)) {
     assert(cur->type() != T_FLOAT && cur->type() != T_DOUBLE, "cpu regs only");
     _first_reg = pd_first_byte_reg;