hg: jdk9/sandbox/hotspot: Merge

magnus.ihse.bursie at oracle.com magnus.ihse.bursie at oracle.com
Fri Dec 18 21:34:33 UTC 2015


Changeset: 8c3e4f8a03ea
Author:    ihse
Date:      2015-12-18 22:34 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/8c3e4f8a03ea

Merge

- make/aix/makefiles/sa.make
- make/aix/makefiles/saproc.make
! make/bsd/makefiles/gcc.make
- make/bsd/makefiles/sa.make
! make/bsd/makefiles/vm.make
- make/jdk6_hotspot_distro
- make/linux/makefiles/sa.make
- make/linux/makefiles/saproc.make
- make/sa.files
- make/solaris/makefiles/sa.make
- make/solaris/makefiles/saproc.make
- make/windows/makefiles/sa.make
! src/cpu/x86/vm/sharedRuntime_x86_64.cpp
- src/cpu/x86/vm/templateInterpreter_x86_32.cpp
- src/cpu/x86/vm/templateInterpreter_x86_64.cpp
- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/AbstractAddress.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/StackSlotValue.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/UnsignedMath.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/VirtualStackSlot.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.compiler/src/jdk/vm/ci/compiler/Compiler.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.compiler/src/jdk/vm/ci/compiler/CompilerFactory.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.compiler/src/jdk/vm/ci/compiler/StartupEventListener.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SuppressFBWarnings.java
- src/jdk.vm.ci/share/classes/jdk.vm.ci.options/src/jdk/vm/ci/options/JVMCIJarsOptionDescriptorsProvider.java
- src/os/aix/vm/thread_aix.inline.hpp
- src/os/aix/vm/vmError_aix.cpp
! src/os/bsd/vm/os_bsd.cpp
- src/os/bsd/vm/thread_bsd.inline.hpp
- src/os/bsd/vm/vmError_bsd.cpp
- src/os/linux/vm/thread_linux.inline.hpp
- src/os/linux/vm/vmError_linux.cpp
- src/os/solaris/vm/thread_solaris.inline.hpp
- src/os/solaris/vm/vmError_solaris.cpp
- src/os/windows/vm/thread_windows.inline.hpp
- src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp
- src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp
- src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp
- src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp
- src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp
- src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp
- src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.cpp
- src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.hpp
- src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp
- src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp
- src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp
- src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp
- src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp
- src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
- src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp
- src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp
- src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp
- src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp
- src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp
- src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp
- src/os_cpu/windows_x86/vm/threadLS_windows_x86.cpp
- src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp
- src/share/vm/gc/g1/satbQueue.cpp
- src/share/vm/gc/g1/satbQueue.hpp
- src/share/vm/runtime/threadLocalStorage.cpp
- test/compiler/compilercontrol/parser/DirectiveParser.java
- test/compiler/compilercontrol/share/processors/QuietProcessor.java
- test/compiler/intrinsics/bmi/verifycode/AddnTestI.java
- test/compiler/intrinsics/bmi/verifycode/AddnTestL.java
- test/compiler/jvmci/common/services/jdk.vm.ci.compiler.Compiler
- test/compiler/jvmci/common/services/jdk.vm.ci.compiler.CompilerFactory
- test/compiler/jvmci/events/JvmciCompleteInitializationTest.config
- test/compiler/jvmci/events/JvmciCompleteInitializationTest.java
- test/runtime/classFileParserBug/ignoredClinit.jasm



More information about the jdk9-sandbox-changes mailing list