Hi, This webrev brings jdk8u161-b12 (the upstream version) into the aarch64/jdk8u repositories, tagging the result as aarch64-jdk8u161-b16 http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/ To illustrate the actual changes, the merge changesets for each repository are also included: http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/corba/merge.chang... http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/jaxp/merge.change... http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/jaxws/merge.chang... http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/jdk/merge.changes... http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/hotspot/merge.cha... http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/langtools/merge.c... http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/nashorn/merge.cha... http://cr.openjdk.java.net/~andrew/aarch64-8/u161.upstream/root/merge.change... Changes in aarch64-jdk8u161-b16: - S8140436: Negotiated Finite Field Diffie-Hellman Ephemeral Parameters for TLS - S8161598: Kitchensink fails: assert(nm->insts_contains(original_pc)) failed: original PC must be in nmethod/CompiledMethod - S8164113: AArch64: follow-up the fix for 8161598 - S8172297: In java 8, the marshalling with JAX-WS does not escape carriage return - S8173631: Backout three hotspot fixes from 8u121-bpr repo - S8178536: OOM ERRORS + SERVICE-THREAD TAKES A PROCESSOR TO 100% - S8179223: Integrate 8176490 into 8u131-bpr repo - S8181439: Test the jdk.tls.namedGroups System Property - S8182614: Backout JDK-8140436 from 8u161 - S8183939: Import JDK-8182672 into 8u141-bpr repo - S8185572: Enable AssumeMP by default on SPARC machines - S8186699: Clean up extra Derby files - S8187482: Backout JDK-8159377 - S8191340: 8ux linux builds failing - com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl (unknown type) - S8191352: Remove 8u161-b07 and 8u162-b07 tag to include 8191340 for b07 The many duplicates merged that were already in the aarch64/jdk8u repository have been removed from the list above. 8164113 was backported from OpenJDK 9 due to the appearance of 8161598 upstream. It applied as is, with the substitution of assert for vmassert, as 8068396 is not present in OpenJDK 8. This isn't included in the diffstat statistics below as it's not part of the merge itself. diffstat for root b/.hgtags | 52 +++++++++++++++++++++++++++++++ b/common/autoconf/generated-configure.sh | 2 - 2 files changed, 53 insertions(+), 1 deletion(-) diffstat for corba b/.hgtags | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diffstat for jaxp b/.hgtags | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diffstat for jaxws b/.hgtags | 61 ++++++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java | 45 ++++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java | 4 b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java | 13 + b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java | 5 b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java | 5 b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java | 100 +++++++++- 7 files changed, 219 insertions(+), 14 deletions(-) diffstat for langtools b/.hgtags | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diffstat for nashorn b/.hgtags | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diffstat for jdk a/src/share/classes/sun/misc/JavaObjectInputStreamAccess.java | 41 -- a/src/share/classes/sun/misc/ObjectStreamClassValidator.java | 43 -- b/.hgtags | 82 +++++ b/make/Images.gmk | 3 b/make/profile-rtjar-includes.txt | 1 b/src/share/classes/java/util/HashMap.java | 2 b/src/share/classes/sun/management/MemoryPoolImpl.java | 8 b/src/share/lib/security/java.security-aix | 1 b/test/javax/xml/ws/8172297/Main.java | 157 ++++++++++ b/test/javax/xml/ws/8172297/ws/HelloWorld.java | 39 ++ b/test/javax/xml/ws/8172297/ws/HelloWorldImpl.java | 39 ++ 11 files changed, 325 insertions(+), 91 deletions(-) diffstat for hotspot b/.hgtags | 97 ++++++++++++++++ b/src/cpu/x86/vm/c1_Runtime1_x86.cpp | 4 b/src/cpu/x86/vm/frame_x86.cpp | 31 ++++- b/src/cpu/x86/vm/frame_x86.inline.hpp | 1 b/src/cpu/x86/vm/javaFrameAnchor_x86.hpp | 7 - b/src/cpu/x86/vm/macroAssembler_x86.cpp | 16 +- b/src/cpu/x86/vm/macroAssembler_x86.hpp | 4 b/src/cpu/x86/vm/runtime_x86_32.cpp | 2 b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp | 16 +- b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp | 18 +- b/src/cpu/x86/vm/stubGenerator_x86_32.cpp | 2 b/src/cpu/x86/vm/stubGenerator_x86_64.cpp | 2 b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp | 4 b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp | 4 b/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp | 2 b/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp | 8 - b/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp | 2 b/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp | 8 - b/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp | 5 b/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp | 8 - b/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp | 2 b/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp | 8 - b/src/share/vm/runtime/arguments.cpp | 10 + b/src/share/vm/services/lowMemoryDetector.cpp | 32 ++++- b/test/runtime/RedefineTests/RedefineInterfaceCall.java | 83 +++++++++++++ 25 files changed, 295 insertions(+), 81 deletions(-) Merged to shenandoah without issue and I've done successful builds of the shenandoah version on both x86_64 and aarch64. Ok to push? -- Andrew :) Senior Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Web Site: http://fuseyism.com Twitter: https://twitter.com/gnu_andrew_java PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222