src/hotspot/cpu/x86/vm_version_x86.cpp

*** 883,902 ****
    } else if (UseSHA) {
      warning("SHA instructions are not available on this CPU");
      FLAG_SET_DEFAULT(UseSHA, false);
    }
  
!   if (supports_sha() && UseSHA) {
      if (FLAG_IS_DEFAULT(UseSHA1Intrinsics)) {
        FLAG_SET_DEFAULT(UseSHA1Intrinsics, true);
      }
    } else if (UseSHA1Intrinsics) {
      warning("Intrinsics for SHA-1 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
    }
  
!   if (UseSHA) {
      if (FLAG_IS_DEFAULT(UseSHA256Intrinsics)) {
        FLAG_SET_DEFAULT(UseSHA256Intrinsics, true);
      }
    } else if (UseSHA256Intrinsics) {
      warning("Intrinsics for SHA-224 and SHA-256 crypto hash functions not available on this CPU.");
--- 883,902 ----
    } else if (UseSHA) {
      warning("SHA instructions are not available on this CPU");
      FLAG_SET_DEFAULT(UseSHA, false);
    }
  
!   if (supports_sha() && supports_sse4_1() && UseSHA) {
      if (FLAG_IS_DEFAULT(UseSHA1Intrinsics)) {
        FLAG_SET_DEFAULT(UseSHA1Intrinsics, true);
      }
    } else if (UseSHA1Intrinsics) {
      warning("Intrinsics for SHA-1 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
    }
  
!   if (supports_sse4_1() && UseSHA) {
      if (FLAG_IS_DEFAULT(UseSHA256Intrinsics)) {
        FLAG_SET_DEFAULT(UseSHA256Intrinsics, true);
      }
    } else if (UseSHA256Intrinsics) {
      warning("Intrinsics for SHA-224 and SHA-256 crypto hash functions not available on this CPU.");