Merge
authorduke
Wed, 05 Jul 2017 21:09:27 +0200
changeset 34729 b56d78298f9f
parent 34728 1e7bf1564066 (diff)
parent 34727 95166de4f0a1 (current diff)
child 34741 6f034bebd711
Merge
hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
hotspot/src/os/aix/vm/thread_aix.inline.hpp
hotspot/src/os/bsd/vm/thread_bsd.inline.hpp
hotspot/src/os/linux/vm/thread_linux.inline.hpp
hotspot/src/os/solaris/vm/thread_solaris.inline.hpp
hotspot/src/os/windows/vm/thread_windows.inline.hpp
hotspot/src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp
hotspot/src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp
hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp
hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp
hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp
hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp
hotspot/src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.cpp
hotspot/src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.hpp
hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp
hotspot/src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp
hotspot/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp
hotspot/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp
hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp
hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp
hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp
hotspot/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp
hotspot/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp
hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp
hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp
hotspot/src/os_cpu/windows_x86/vm/threadLS_windows_x86.cpp
hotspot/src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp
hotspot/src/share/vm/gc/g1/g1RootClosures.inline.hpp
hotspot/src/share/vm/runtime/threadLocalStorage.cpp
hotspot/test/runtime/logging/SafepointTestMain.java
hotspot/test/runtime/logging/VMOperationTestMain.java
jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java
jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java
jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java
jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java
jdk/src/java.base/share/classes/sun/misc/HexDumpEncoder.java
jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
jdk/src/java.base/share/classes/sun/misc/Queue.java
jdk/src/java.base/share/classes/sun/misc/Request.java
jdk/src/java.base/share/classes/sun/misc/RequestProcessor.java
jdk/src/java.base/share/classes/sun/misc/UCDecoder.java
jdk/src/java.base/share/classes/sun/misc/UCEncoder.java
jdk/src/java.base/share/classes/sun/misc/UUDecoder.java
jdk/src/java.base/share/classes/sun/misc/UUEncoder.java
jdk/src/java.base/share/native/libzip/ZipFile.c
jdk/test/sun/misc/Encode/DecodeBuffer.java
jdk/test/sun/misc/Encode/Encode.java
jdk/test/sun/misc/Encode/GetBytes.java
--- a/corba/.hgtags	Wed Jul 05 21:09:22 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 21:09:27 2017 +0200
@@ -340,3 +340,4 @@
 fd038e8a16eec80d0d6b337d74a582790ed4b3ee jdk-9+95
 feb1bd85d7990dcf5584ca9e53104269c01db006 jdk-9+96
 10a482b863582376d4ca229090334b23b05159fc jdk-9+97
+ea285530245cf4e0edf0479121a41347d3030eba jdk-9+98