--- old/src/hotspot/cpu/x86/vm_version_x86.cpp	2018-01-03 17:02:48.168836924 +0100
+++ new/src/hotspot/cpu/x86/vm_version_x86.cpp	2018-01-03 17:02:47.980844556 +0100
@@ -882,7 +882,7 @@
     FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
   }
 
-  if (UseSHA) {
+  if (UseSHA LP64_ONLY(&& supports_avx2() && supports_bmi2())) {
     if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) {
       FLAG_SET_DEFAULT(UseSHA512Intrinsics, true);
     }