changeset 9136:cfc4037363f9 jdk8u222-ga-aarch32-190717

Merge
author snazarki
date Wed, 17 Jul 2019 21:55:51 +0300
parents d8efd831d6fb da3a1f729b2b
children daa49371a53a
files .hgtags
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 10 17:00:50 2019 +0300
+++ b/.hgtags	Wed Jul 17 21:55:51 2019 +0300
@@ -1296,3 +1296,7 @@
 1e49a78aefb2f3ffcff4e26665b2116c67a5c68c jdk8u222-b07-aarch32-190627
 75f4e02f1113bc353fc60df7330dd5456efc49a3 jdk8u222-b07
 26d64a5c4b9a6123c83115afd1f3a13dafa69d3b jdk8u222-b08-aarch32-190710
+36a743eee6721b423b7c21a3ba28ac8d906a5386 jdk8u222-b08
+55f693ba975d445d83a59cc32367ec4c2452b0c5 jdk8u222-b09
+adfdce09acc32a691145a67792d47ab637159776 jdk8u222-b10
+adfdce09acc32a691145a67792d47ab637159776 jdk8u222-ga
--- a/src/share/vm/classfile/vmSymbols.hpp	Wed Jul 10 17:00:50 2019 +0300
+++ b/src/share/vm/classfile/vmSymbols.hpp	Wed Jul 17 21:55:51 2019 +0300
@@ -832,21 +832,21 @@
   do_class(com_sun_crypto_provider_aescrypt,      "com/sun/crypto/provider/AESCrypt")                                   \
   do_intrinsic(_aescrypt_encryptBlock, com_sun_crypto_provider_aescrypt, encryptBlock_name, byteArray_int_byteArray_int_signature, F_R)   \
   do_intrinsic(_aescrypt_decryptBlock, com_sun_crypto_provider_aescrypt, decryptBlock_name, byteArray_int_byteArray_int_signature, F_R)   \
-   do_name(     encryptBlock_name,                                 "encryptBlock")                                      \
-   do_name(     decryptBlock_name,                                 "decryptBlock")                                      \
+   do_name(     encryptBlock_name,                                 "implEncryptBlock")                                  \
+   do_name(     decryptBlock_name,                                 "implDecryptBlock")                                  \
    do_signature(byteArray_int_byteArray_int_signature,             "([BI[BI)V")                                         \
                                                                                                                         \
   do_class(com_sun_crypto_provider_cipherBlockChaining,            "com/sun/crypto/provider/CipherBlockChaining")       \
    do_intrinsic(_cipherBlockChaining_encryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, encrypt_name, byteArray_int_int_byteArray_int_signature, F_R)   \
    do_intrinsic(_cipherBlockChaining_decryptAESCrypt, com_sun_crypto_provider_cipherBlockChaining, decrypt_name, byteArray_int_int_byteArray_int_signature, F_R)   \
-   do_name(     encrypt_name,                                      "encrypt")                                           \
-   do_name(     decrypt_name,                                      "decrypt")                                           \
+   do_name(     encrypt_name,                                      "implEncrypt")                                       \
+   do_name(     decrypt_name,                                      "implDecrypt")                                       \
    do_signature(byteArray_int_int_byteArray_int_signature,         "([BII[BI)I")                                        \
                                                                                                                         \
   /* support for sun.security.provider.SHA */                                                                           \
   do_class(sun_security_provider_sha,                              "sun/security/provider/SHA")                         \
   do_intrinsic(_sha_implCompress, sun_security_provider_sha, implCompress_name, implCompress_signature, F_R)            \
-   do_name(     implCompress_name,                                 "implCompress")                                      \
+   do_name(     implCompress_name,                                 "implCompress0")                                     \
    do_signature(implCompress_signature,                            "([BI)V")                                            \
                                                                                                                         \
   /* support for sun.security.provider.SHA2 */                                                                          \
@@ -860,7 +860,7 @@
   /* support for sun.security.provider.DigestBase */                                                                    \
   do_class(sun_security_provider_digestbase,                       "sun/security/provider/DigestBase")                  \
   do_intrinsic(_digestBase_implCompressMB, sun_security_provider_digestbase, implCompressMB_name, implCompressMB_signature, F_R)   \
-   do_name(     implCompressMB_name,                               "implCompressMultiBlock")                            \
+   do_name(     implCompressMB_name,                               "implCompressMultiBlock0")                           \
    do_signature(implCompressMB_signature,                          "([BII)I")                                           \
                                                                                                                         \
   /* support for java.util.zip */                                                                                       \