Mercurial > hg > release > icedtea7-forest-2.6 > hotspot
changeset 6724:8f77e4099f09
Merge jdk7u231-b01
| author | andrew |
|---|---|
| date | Mon, 15 Jul 2019 18:55:46 +0100 |
| parents | 5428c90434ec (current diff) f0935d83f31f (diff) |
| children | 1bf03fa0773b |
| files | .hgtags src/share/vm/classfile/vmSymbols.hpp |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Apr 17 04:32:42 2019 +0100 +++ b/.hgtags Mon Jul 15 18:55:46 2019 +0100 @@ -943,3 +943,6 @@ 4d49c350aea9078c934ee220668fc7dab1b830ce jdk7u221-b01 39dc424afc0e4acf27b4570f864e5e9378127777 jdk7u221-b02 6e7512a54bc6162bb648277205c51f38971d0da6 icedtea-2.6.18 +39dc424afc0e4acf27b4570f864e5e9378127777 jdk7u221-ga +39dc424afc0e4acf27b4570f864e5e9378127777 jdk7u231-b00 +a8f5a2d0d6a0d4f7501c0f6c1efe933532d4e627 jdk7u231-b01
--- a/src/share/vm/classfile/vmSymbols.hpp Wed Apr 17 04:32:42 2019 +0100 +++ b/src/share/vm/classfile/vmSymbols.hpp Mon Jul 15 18:55:46 2019 +0100 @@ -734,15 +734,15 @@ 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 java.util.zip */ \