*** old/src/cpu/sparc/vm/vm_version_sparc.cpp	Tue Jun 10 17:34:37 2014
--- new/src/cpu/sparc/vm/vm_version_sparc.cpp	Tue Jun 10 17:34:37 2014

*** 232,250 ****
--- 232,253 ----
  
    assert((CodeEntryAlignment % relocInfo::addr_unit()) == 0, "alignment is not a multiple of NOP size");
    assert((OptoLoopAlignment % relocInfo::addr_unit()) == 0, "alignment is not a multiple of NOP size");
  
    char buf[512];
!   jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
!   jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                 (has_v9() ? ", v9" : (has_v8() ? ", v8" : "")),
                 (has_hardware_popc() ? ", popc" : ""),
                 (has_vis1() ? ", vis1" : ""),
                 (has_vis2() ? ", vis2" : ""),
                 (has_vis3() ? ", vis3" : ""),
                 (has_blk_init() ? ", blk_init" : ""),
                 (has_cbcond() ? ", cbcond" : ""),
                 (has_aes() ? ", aes" : ""),
+                (has_sha1() ? ", sha1" : ""),
+                (has_sha256() ? ", sha256" : ""),
+                (has_sha512() ? ", sha512" : ""),
                 (is_ultra3() ? ", ultra3" : ""),
                 (is_sun4v() ? ", sun4v" : ""),
                 (is_niagara_plus() ? ", niagara_plus" : (is_niagara() ? ", niagara" : "")),
                 (is_sparc64() ? ", sparc64" : ""),
                 (!has_hardware_mul32() ? ", no-mul32" : ""),

*** 299,308 ****
--- 302,363 ----
      if (UseAESIntrinsics) {
        FLAG_SET_DEFAULT(UseAESIntrinsics, false);
      }
    }
  
+   // SHA1, SHA256, and SHA512 instructions were added to SPARC T-series at different times
+   if (has_sha1() || has_sha256() || has_sha512()) {
+     if (UseVIS > 0) { // SHA intrinsics use VIS1 instructions
+       if (FLAG_IS_DEFAULT(UseSHA)) {
+         FLAG_SET_DEFAULT(UseSHA, true);
+       }
+     } else {
+       if (UseSHA) {
+         warning("SPARC SHA intrinsics require VIS1 instruction support. Intrinsics will be disabled.");
+         FLAG_SET_DEFAULT(UseSHA, false);
+       }
+     }
+   } else if (UseSHA) {
+     warning("SHA instructions are not available on this CPU");
+     FLAG_SET_DEFAULT(UseSHA, false);
+   }
+ 
+   if (!UseSHA) {
+     FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
+     FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
+     FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
+   } else {
+     if (has_sha1()) {
+       if (FLAG_IS_DEFAULT(UseSHA1Intrinsics)) {
+         FLAG_SET_DEFAULT(UseSHA1Intrinsics, true);
+       }
+     } else if (UseSHA1Intrinsics) {
+       warning("SHA1 instruction is not available on this CPU.");
+       FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
+     }
+     if (has_sha256()) {
+       if (FLAG_IS_DEFAULT(UseSHA256Intrinsics)) {
+         FLAG_SET_DEFAULT(UseSHA256Intrinsics, true);
+       }
+     } else if (UseSHA256Intrinsics) {
+       warning("SHA256 instruction (for SHA-224 and SHA-256) is not available on this CPU.");
+       FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
+     }
+ 
+     if (has_sha512()) {
+       if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) {
+         FLAG_SET_DEFAULT(UseSHA512Intrinsics, true);
+       }
+     } else if (UseSHA512Intrinsics) {
+       warning("SHA512 instruction (for SHA-384 and SHA-512) is not available on this CPU.");
+       FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
+     }
+     if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
+       FLAG_SET_DEFAULT(UseSHA, false);
+     }
+   }
+ 
    if (FLAG_IS_DEFAULT(ContendedPaddingWidth) &&
      (cache_line_size > ContendedPaddingWidth))
      ContendedPaddingWidth = cache_line_size;
  
  #ifndef PRODUCT