--- a/src/hotspot/cpu/s390/vm_version_s390.cpp	Tue Jul 03 09:11:00 2018 +0200
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp	Tue Jul 03 12:40:42 2018 +0200
@@ -210,6 +210,10 @@
     FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
   }
 
+  if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
+    FLAG_SET_DEFAULT(UseSHA, false);
+  }
+
   if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
     FLAG_SET_DEFAULT(UseMultiplyToLenIntrinsic, true);
   }