*** old/src/cpu/x86/vm/vm_version_x86.cpp	Wed Sep 16 15:17:55 2015
--- new/src/cpu/x86/vm/vm_version_x86.cpp	Wed Sep 16 15:17:55 2015

*** 778,787 ****
--- 778,789 ----
      if (UseSSE < 2) {
        // Only supported with SSE2+
        FLAG_SET_DEFAULT(UseFPUForSpilling, false);
      }
    }
+ #endif
+ #if defined(COMPILER2) || INCLUDE_JVMCI
    if (MaxVectorSize > 0) {
      if (!is_power_of_2(MaxVectorSize)) {
        warning("MaxVectorSize must be a power of 2");
        FLAG_SET_DEFAULT(MaxVectorSize, 64);
      }

*** 794,804 ****
--- 796,806 ----
      }
      if (UseSSE < 2) {
        // Vectors (in XMM) are only supported with SSE2+
        FLAG_SET_DEFAULT(MaxVectorSize, 0);
      }
! #ifdef ASSERT
! #if defined(COMPILER2) && defined(ASSERT)
      if (supports_avx() && PrintMiscellaneous && Verbose && TraceNewVectors) {
        tty->print_cr("State of YMM registers after signal handle:");
        int nreg = 2 LP64_ONLY(+2);
        const char* ymm_name[4] = {"0", "7", "8", "15"};
        for (int i = 0; i < nreg; i++) {

*** 809,819 ****
--- 811,823 ----
          tty->cr();
        }
      }
  #endif
    }
+ #endif
  
+ #ifdef COMPILER2
  #ifdef _LP64
    if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
      UseMultiplyToLenIntrinsic = true;
    }
    if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {