*** old/src/cpu/x86/vm/vm_version_x86.cpp	Fri Oct 10 15:05:21 2014
--- new/src/cpu/x86/vm/vm_version_x86.cpp	Fri Oct 10 15:05:21 2014

*** 863,880 ****
--- 863,885 ----
  
    // Use count trailing zeros instruction if available
    if (supports_bmi1()) {
      // tzcnt does not require VEX prefix
      if (FLAG_IS_DEFAULT(UseCountTrailingZerosInstruction)) {
+       if (!UseBMI1Instructions && !FLAG_IS_DEFAULT(UseBMI1Instructions)) {
+         // Don't use tzcnt if BMI1 is switched off on command line.
+         UseCountTrailingZerosInstruction = false;
+       } else {
          UseCountTrailingZerosInstruction = true;
        }
+     }
    } else if (UseCountTrailingZerosInstruction) {
      warning("tzcnt instruction is not available on this CPU");
      FLAG_SET_DEFAULT(UseCountTrailingZerosInstruction, false);
    }
  
!   // BMI instructions (except tzcnt) use an encoding with VEX prefix.
    // VEX prefix is generated only when AVX > 0.
    if (supports_bmi1() && supports_avx()) {
      if (FLAG_IS_DEFAULT(UseBMI1Instructions)) {
        UseBMI1Instructions = true;
      }