--- old/src/cpu/x86/vm/vm_version_x86.cpp	2016-04-19 16:17:28.136927100 -0700
+++ new/src/cpu/x86/vm/vm_version_x86.cpp	2016-04-19 16:17:27.936887100 -0700
@@ -731,7 +731,7 @@
     FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
   }
 
-  if (supports_sha()) {
+  if (supports_sha() LP64_ONLY(|| supports_avx2())) {
     if (FLAG_IS_DEFAULT(UseSHA)) {
       UseSHA = true;
     }
@@ -740,7 +740,7 @@
     FLAG_SET_DEFAULT(UseSHA, false);
   }
 
-  if (UseSHA) {
+  if (supports_sha() && UseSHA) {
     if (FLAG_IS_DEFAULT(UseSHA1Intrinsics)) {
       FLAG_SET_DEFAULT(UseSHA1Intrinsics, true);
     }