From b913444be0d1288cbca3ec13cb7f57844de1b2d9 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 3 Jul 2018 12:40:42 +0200
Subject: [PATCH] 8206255: fix
 compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java jtreg test on
 linux s390x

Reviewed-by: stuefe
---
 src/hotspot/cpu/s390/vm_version_s390.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp
index 72d30b176d9..afd875bb1fe 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.cpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp
@@ -210,6 +210,10 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
   }
 
+  if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
+    FLAG_SET_DEFAULT(UseSHA, false);
+  }
+
   if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
     FLAG_SET_DEFAULT(UseMultiplyToLenIntrinsic, true);
   }