From 691c5da59352e8473de53e67252d719df1c02601 Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Wed, 20 Apr 2022 22:41:17 +0000 Subject: [PATCH] 8285266: compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java fails after JDK-8284563 Reviewed-by: mikael --- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp | 4 ++-- src/hotspot/cpu/aarch64/vm_version_aarch64.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp index 07979998ff0..63ba7efc0a5 100644 --- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp @@ -308,7 +308,7 @@ void VM_Version::initialize() { UseMD5Intrinsics = true; } - if (VM_Version::supports_sha1() || VM_Version::supports_sha2() || + if (VM_Version::supports_sha1() || VM_Version::supports_sha256() || VM_Version::supports_sha3() || VM_Version::supports_sha512()) { if (FLAG_IS_DEFAULT(UseSHA)) { FLAG_SET_DEFAULT(UseSHA, true); @@ -327,7 +327,7 @@ void VM_Version::initialize() { FLAG_SET_DEFAULT(UseSHA1Intrinsics, false); } - if (UseSHA && VM_Version::supports_sha2()) { + if (UseSHA && VM_Version::supports_sha256()) { if (FLAG_IS_DEFAULT(UseSHA256Intrinsics)) { FLAG_SET_DEFAULT(UseSHA256Intrinsics, true); } diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp index f5f400c39ac..b93e59bb6f6 100644 --- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp @@ -107,7 +107,7 @@ public: decl(AES, aes, 3) \ decl(PMULL, pmull, 4) \ decl(SHA1, sha1, 5) \ - decl(SHA2, sha2, 6) \ + decl(SHA2, sha256, 6) \ decl(CRC32, crc32, 7) \ decl(LSE, lse, 8) \ decl(DCPOP, dcpop, 16) \