src/cpu/x86/vm/vm_version_x86.cpp

*** 575,585 ****
      // HT processor could be installed on a system which doesn't support HT.
      _features &= ~CPU_HT;
    }
  
    char buf[256];
!   jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                 cores_per_cpu(), threads_per_core(),
                 cpu_family(), _model, _stepping,
                 (supports_cmov() ? ", cmov" : ""),
                 (supports_cmpxchg8() ? ", cx8" : ""),
                 (supports_fxsr() ? ", fxsr" : ""),
--- 575,585 ----
      // HT processor could be installed on a system which doesn't support HT.
      _features &= ~CPU_HT;
    }
  
    char buf[256];
!   jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                 cores_per_cpu(), threads_per_core(),
                 cpu_family(), _model, _stepping,
                 (supports_cmov() ? ", cmov" : ""),
                 (supports_cmpxchg8() ? ", cx8" : ""),
                 (supports_fxsr() ? ", fxsr" : ""),
*** 606,616 ****
                 (supports_tscinv_bit() ? ", tscinvbit": ""),
                 (supports_tscinv() ? ", tscinv": ""),
                 (supports_bmi1() ? ", bmi1" : ""),
                 (supports_bmi2() ? ", bmi2" : ""),
                 (supports_adx() ? ", adx" : ""),
!                (supports_evex() ? ", evex" : ""));
    _features_string = os::strdup(buf);
  
    // UseSSE is set to the smaller of what hardware supports and what
    // the command line requires.  I.e., you cannot set UseSSE to 2 on
    // older Pentiums which do not support it.
--- 606,617 ----
                 (supports_tscinv_bit() ? ", tscinvbit": ""),
                 (supports_tscinv() ? ", tscinv": ""),
                 (supports_bmi1() ? ", bmi1" : ""),
                 (supports_bmi2() ? ", bmi2" : ""),
                 (supports_adx() ? ", adx" : ""),
!                (supports_evex() ? ", evex" : ""),
!                (supports_sha() ? ", sha" : ""));
    _features_string = os::strdup(buf);
  
    // UseSSE is set to the smaller of what hardware supports and what
    // the command line requires.  I.e., you cannot set UseSSE to 2 on
    // older Pentiums which do not support it.
*** 728,757 ****
      if (!FLAG_IS_DEFAULT(UseGHASHIntrinsics))
        warning("GHASH intrinsic requires CLMUL and SSE2 instructions on this CPU");
      FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
    }
  
!   if (UseSHA) {
      warning("SHA instructions are not available on this CPU");
      FLAG_SET_DEFAULT(UseSHA, false);
    }
  
!   if (UseSHA1Intrinsics) {
      warning("Intrinsics for SHA-1 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
    }
  
!   if (UseSHA256Intrinsics) {
      warning("Intrinsics for SHA-224 and SHA-256 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
    }
  
    if (UseSHA512Intrinsics) {
      warning("Intrinsics for SHA-384 and SHA-512 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
    }
  
    if (UseAdler32Intrinsics) {
      warning("Adler32Intrinsics not available on this CPU.");
      FLAG_SET_DEFAULT(UseAdler32Intrinsics, false);
    }
  
--- 729,774 ----
      if (!FLAG_IS_DEFAULT(UseGHASHIntrinsics))
        warning("GHASH intrinsic requires CLMUL and SSE2 instructions on this CPU");
      FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
    }
  
!   if (supports_sha()) {
!     if (FLAG_IS_DEFAULT(UseSHA)) {
!       UseSHA = true;
!     }
!   } else if (UseSHA) {
      warning("SHA instructions are not available on this CPU");
      FLAG_SET_DEFAULT(UseSHA, false);
    }
  
!   if (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.");
      FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
    }
  
    if (UseSHA512Intrinsics) {
      warning("Intrinsics for SHA-384 and SHA-512 crypto hash functions not available on this CPU.");
      FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
    }
  
+   if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
+     FLAG_SET_DEFAULT(UseSHA, false);
+   }
+ 
    if (UseAdler32Intrinsics) {
      warning("Adler32Intrinsics not available on this CPU.");
      FLAG_SET_DEFAULT(UseAdler32Intrinsics, false);
    }