changeset 41265:4499c77553f4

Merge
author dlong
date Tue, 20 Sep 2016 16:34:44 -0400
parents 28502a6422d6 1cff7bfbf525
children 287d428e24a8
files hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp hotspot/src/share/vm/gc/g1/g1Predictions.cpp hotspot/src/share/vm/gc/shared/memset_with_concurrent_readers.cpp hotspot/src/share/vm/gc/shared/referencePendingListLocker.cpp hotspot/src/share/vm/gc/shared/referencePendingListLocker.hpp hotspot/src/share/vm/runtime/atomic.inline.hpp hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java hotspot/test/serviceability/sa/jmap-hashcode/Test8028623.java hotspot/test/testlibrary/ClassFileInstaller.java hotspot/test/testlibrary/RedefineClassHelper.java hotspot/test/testlibrary/jdk/test/lib/AllocationHelper.java hotspot/test/testlibrary/jdk/test/lib/Asserts.java hotspot/test/testlibrary/jdk/test/lib/BuildHelper.java hotspot/test/testlibrary/jdk/test/lib/ByteCodeLoader.java hotspot/test/testlibrary/jdk/test/lib/DynamicVMOption.java hotspot/test/testlibrary/jdk/test/lib/ExitCode.java hotspot/test/testlibrary/jdk/test/lib/FileInstaller.java hotspot/test/testlibrary/jdk/test/lib/HeapRegionUsageTool.java hotspot/test/testlibrary/jdk/test/lib/InMemoryJavaCompiler.java hotspot/test/testlibrary/jdk/test/lib/InfiniteLoop.java hotspot/test/testlibrary/jdk/test/lib/InputArguments.java hotspot/test/testlibrary/jdk/test/lib/JDKToolFinder.java hotspot/test/testlibrary/jdk/test/lib/JDKToolLauncher.java hotspot/test/testlibrary/jdk/test/lib/OutputAnalyzer.java hotspot/test/testlibrary/jdk/test/lib/OutputBuffer.java hotspot/test/testlibrary/jdk/test/lib/Pair.java hotspot/test/testlibrary/jdk/test/lib/Platform.java hotspot/test/testlibrary/jdk/test/lib/ProcessTools.java hotspot/test/testlibrary/jdk/test/lib/StreamPumper.java hotspot/test/testlibrary/jdk/test/lib/TimeLimitedRunner.java hotspot/test/testlibrary/jdk/test/lib/Triple.java hotspot/test/testlibrary/jdk/test/lib/Utils.java hotspot/test/testlibrary/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java hotspot/test/testlibrary/jdk/test/lib/cli/CommandLineOptionTest.java hotspot/test/testlibrary/jdk/test/lib/cli/predicate/AndPredicate.java hotspot/test/testlibrary/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java hotspot/test/testlibrary/jdk/test/lib/cli/predicate/NotPredicate.java hotspot/test/testlibrary/jdk/test/lib/cli/predicate/OrPredicate.java hotspot/test/testlibrary/jdk/test/lib/dcmd/CommandExecutor.java hotspot/test/testlibrary/jdk/test/lib/dcmd/CommandExecutorException.java hotspot/test/testlibrary/jdk/test/lib/dcmd/FileJcmdExecutor.java hotspot/test/testlibrary/jdk/test/lib/dcmd/JMXExecutor.java hotspot/test/testlibrary/jdk/test/lib/dcmd/JcmdExecutor.java hotspot/test/testlibrary/jdk/test/lib/dcmd/MainClassJcmdExecutor.java hotspot/test/testlibrary/jdk/test/lib/dcmd/PidJcmdExecutor.java hotspot/test/testlibrary/jdk/test/lib/dtrace/DtraceResultsAnalyzer.java hotspot/test/testlibrary/jdk/test/lib/dtrace/DtraceRunner.java jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRulesProvider.java jdk/src/jdk.localedata/share/classes/sun/text/resources/thai_dict jdk/test/sun/security/krb5/auto/unreachable.krb5.conf jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256 test/lib/jdk/test/lib/Platform.java test/lib/jdk/test/lib/unsafe/UnsafeHelper.java
diffstat 2828 files changed, 51966 insertions(+), 22963 deletions(-) [+]