/hg/release/icedtea7-forest-2.6/hotspot: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 28 14:47:31 UTC 2016
changeset 1fc8b9f201f8 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=1fc8b9f201f8
author: andrew
date: Fri Jul 22 15:37:55 2016 +0100
Added tag jdk7u111-b01 for changeset 9efa3fae3c27
changeset 75297b84957e in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=75297b84957e
author: andrew
date: Thu Jul 28 14:59:45 2016 +0100
Merge jdk7u111-b01
diffstat:
.hgtags | 59 +-
.jcheck/conf | 2 -
agent/src/os/linux/LinuxDebuggerLocal.c | 3 +-
agent/src/os/linux/Makefile | 11 +-
agent/src/os/linux/libproc.h | 4 +-
agent/src/os/linux/ps_proc.c | 54 +-
agent/src/os/linux/salibelf.c | 1 +
agent/src/os/linux/symtab.c | 2 +-
make/Makefile | 37 +
make/aix/Makefile | 380 +
make/aix/adlc_updater | 20 +
make/aix/build.sh | 99 +
make/aix/makefiles/adjust-mflags.sh | 87 +
make/aix/makefiles/adlc.make | 234 +
make/aix/makefiles/build_vm_def.sh | 18 +
make/aix/makefiles/buildtree.make | 510 +
make/aix/makefiles/compiler2.make | 32 +
make/aix/makefiles/core.make | 33 +
make/aix/makefiles/defs.make | 233 +
make/aix/makefiles/dtrace.make | 27 +
make/aix/makefiles/fastdebug.make | 73 +
make/aix/makefiles/jsig.make | 95 +
make/aix/makefiles/jvmg.make | 42 +
make/aix/makefiles/jvmti.make | 118 +
make/aix/makefiles/launcher.make | 97 +
make/aix/makefiles/mapfile-vers-debug | 270 +
make/aix/makefiles/mapfile-vers-jsig | 38 +
make/aix/makefiles/mapfile-vers-product | 265 +
make/aix/makefiles/ppc64.make | 108 +
make/aix/makefiles/product.make | 59 +
make/aix/makefiles/rules.make | 203 +
make/aix/makefiles/sa.make | 116 +
make/aix/makefiles/saproc.make | 125 +
make/aix/makefiles/top.make | 144 +
make/aix/makefiles/trace.make | 121 +
make/aix/makefiles/vm.make | 384 +
make/aix/makefiles/xlc.make | 180 +
make/aix/platform_ppc64 | 17 +
make/bsd/Makefile | 30 +-
make/bsd/makefiles/gcc.make | 14 +
make/bsd/platform_zero.in | 2 +-
make/defs.make | 43 +-
make/linux/Makefile | 88 +-
make/linux/makefiles/aarch64.make | 41 +
make/linux/makefiles/adlc.make | 2 +
make/linux/makefiles/buildtree.make | 24 +-
make/linux/makefiles/defs.make | 95 +-
make/linux/makefiles/gcc.make | 59 +-
make/linux/makefiles/jsig.make | 6 +-
make/linux/makefiles/ppc64.make | 76 +
make/linux/makefiles/rules.make | 20 +-
make/linux/makefiles/sa.make | 3 +-
make/linux/makefiles/saproc.make | 8 +-
make/linux/makefiles/vm.make | 79 +-
make/linux/makefiles/zeroshark.make | 32 +
make/linux/platform_aarch64 | 15 +
make/linux/platform_ppc | 6 +-
make/linux/platform_ppc64 | 17 +
make/linux/platform_zero.in | 2 +-
make/solaris/Makefile | 8 +
make/solaris/makefiles/adlc.make | 6 +-
make/solaris/makefiles/dtrace.make | 16 +
make/solaris/makefiles/gcc.make | 4 +-
make/solaris/makefiles/jsig.make | 4 +
make/solaris/makefiles/rules.make | 10 -
make/solaris/makefiles/saproc.make | 4 +
make/solaris/makefiles/vm.make | 12 +
make/windows/makefiles/vm.make | 8 +
src/cpu/aarch64/vm/aarch64.ad | 11622 +++++++++
src/cpu/aarch64/vm/aarch64Test.cpp | 38 +
src/cpu/aarch64/vm/aarch64_ad.m4 | 367 +
src/cpu/aarch64/vm/aarch64_call.cpp | 197 +
src/cpu/aarch64/vm/aarch64_linkage.S | 163 +
src/cpu/aarch64/vm/ad_encode.m4 | 73 +
src/cpu/aarch64/vm/assembler_aarch64.cpp | 5554 ++++
src/cpu/aarch64/vm/assembler_aarch64.hpp | 3585 ++
src/cpu/aarch64/vm/assembler_aarch64.inline.hpp | 44 +
src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.cpp | 51 +
src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.hpp | 117 +
src/cpu/aarch64/vm/bytecodeInterpreter_aarch64.inline.hpp | 287 +
src/cpu/aarch64/vm/bytecodes_aarch64.cpp | 39 +
src/cpu/aarch64/vm/bytecodes_aarch64.hpp | 32 +
src/cpu/aarch64/vm/bytes_aarch64.hpp | 76 +
src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp | 431 +
src/cpu/aarch64/vm/c1_Defs_aarch64.hpp | 82 +
src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.cpp | 203 +
src/cpu/aarch64/vm/c1_FpuStackSim_aarch64.hpp | 74 +
src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp | 345 +
src/cpu/aarch64/vm/c1_FrameMap_aarch64.hpp | 142 +
src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp | 2935 ++
src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp | 80 +
src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp | 1429 +
src/cpu/aarch64/vm/c1_LinearScan_aarch64.cpp | 39 +
src/cpu/aarch64/vm/c1_LinearScan_aarch64.hpp | 78 +
src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.cpp | 456 +
src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp | 107 +
src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp | 1347 +
src/cpu/aarch64/vm/c1_globals_aarch64.hpp | 79 +
src/cpu/aarch64/vm/c2_globals_aarch64.hpp | 87 +
src/cpu/aarch64/vm/c2_init_aarch64.cpp | 37 +
src/cpu/aarch64/vm/codeBuffer_aarch64.hpp | 36 +
src/cpu/aarch64/vm/compile_aarch64.hpp | 40 +
src/cpu/aarch64/vm/copy_aarch64.hpp | 62 +
src/cpu/aarch64/vm/cppInterpreterGenerator_aarch64.hpp | 35 +
src/cpu/aarch64/vm/cpustate_aarch64.hpp | 592 +
src/cpu/aarch64/vm/debug_aarch64.cpp | 36 +
src/cpu/aarch64/vm/decode_aarch64.hpp | 409 +
src/cpu/aarch64/vm/depChecker_aarch64.cpp | 31 +
src/cpu/aarch64/vm/depChecker_aarch64.hpp | 32 +
src/cpu/aarch64/vm/disassembler_aarch64.hpp | 38 +
src/cpu/aarch64/vm/dump_aarch64.cpp | 127 +
src/cpu/aarch64/vm/frame_aarch64.cpp | 843 +
src/cpu/aarch64/vm/frame_aarch64.hpp | 215 +
src/cpu/aarch64/vm/frame_aarch64.inline.hpp | 332 +
src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 36 +
src/cpu/aarch64/vm/globals_aarch64.hpp | 126 +
src/cpu/aarch64/vm/icBuffer_aarch64.cpp | 76 +
src/cpu/aarch64/vm/icache_aarch64.cpp | 41 +
src/cpu/aarch64/vm/icache_aarch64.hpp | 45 +
src/cpu/aarch64/vm/immediate_aarch64.cpp | 312 +
src/cpu/aarch64/vm/immediate_aarch64.hpp | 51 +
src/cpu/aarch64/vm/interp_masm_aarch64.cpp | 1505 +
src/cpu/aarch64/vm/interp_masm_aarch64.hpp | 286 +
src/cpu/aarch64/vm/interpreterGenerator_aarch64.hpp | 57 +
src/cpu/aarch64/vm/interpreterRT_aarch64.cpp | 429 +
src/cpu/aarch64/vm/interpreterRT_aarch64.hpp | 66 +
src/cpu/aarch64/vm/interpreter_aarch64.cpp | 314 +
src/cpu/aarch64/vm/interpreter_aarch64.hpp | 44 +
src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp | 79 +
src/cpu/aarch64/vm/jniFastGetField_aarch64.cpp | 175 +
src/cpu/aarch64/vm/jniTypes_aarch64.hpp | 108 +
src/cpu/aarch64/vm/jni_aarch64.h | 64 +
src/cpu/aarch64/vm/methodHandles_aarch64.cpp | 445 +
src/cpu/aarch64/vm/methodHandles_aarch64.hpp | 63 +
src/cpu/aarch64/vm/nativeInst_aarch64.cpp | 318 +
src/cpu/aarch64/vm/nativeInst_aarch64.hpp | 495 +
src/cpu/aarch64/vm/registerMap_aarch64.hpp | 46 +
src/cpu/aarch64/vm/register_aarch64.cpp | 55 +
src/cpu/aarch64/vm/register_aarch64.hpp | 255 +
src/cpu/aarch64/vm/register_definitions_aarch64.cpp | 156 +
src/cpu/aarch64/vm/relocInfo_aarch64.cpp | 144 +
src/cpu/aarch64/vm/relocInfo_aarch64.hpp | 39 +
src/cpu/aarch64/vm/runtime_aarch64.cpp | 49 +
src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 3109 ++
src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 2380 +
src/cpu/aarch64/vm/stubRoutines_aarch64.cpp | 290 +
src/cpu/aarch64/vm/stubRoutines_aarch64.hpp | 128 +
src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.hpp | 36 +
src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp | 2199 +
src/cpu/aarch64/vm/templateInterpreter_aarch64.hpp | 40 +
src/cpu/aarch64/vm/templateTable_aarch64.cpp | 3909 +++
src/cpu/aarch64/vm/templateTable_aarch64.hpp | 43 +
src/cpu/aarch64/vm/vmStructs_aarch64.hpp | 70 +
src/cpu/aarch64/vm/vm_version_aarch64.cpp | 217 +
src/cpu/aarch64/vm/vm_version_aarch64.hpp | 91 +
src/cpu/aarch64/vm/vmreg_aarch64.cpp | 52 +
src/cpu/aarch64/vm/vmreg_aarch64.hpp | 35 +
src/cpu/aarch64/vm/vmreg_aarch64.inline.hpp | 65 +
src/cpu/aarch64/vm/vtableStubs_aarch64.cpp | 245 +
src/cpu/ppc/vm/assembler_ppc.cpp | 700 +
src/cpu/ppc/vm/assembler_ppc.hpp | 2000 +
src/cpu/ppc/vm/assembler_ppc.inline.hpp | 836 +
src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp | 105 +
src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp | 290 +
src/cpu/ppc/vm/bytecodes_ppc.cpp | 31 +
src/cpu/ppc/vm/bytecodes_ppc.hpp | 31 +
src/cpu/ppc/vm/bytes_ppc.hpp | 281 +
src/cpu/ppc/vm/c2_globals_ppc.hpp | 95 +
src/cpu/ppc/vm/c2_init_ppc.cpp | 48 +
src/cpu/ppc/vm/codeBuffer_ppc.hpp | 35 +
src/cpu/ppc/vm/compile_ppc.cpp | 91 +
src/cpu/ppc/vm/compile_ppc.hpp | 42 +
src/cpu/ppc/vm/copy_ppc.hpp | 171 +
src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp | 43 +
src/cpu/ppc/vm/cppInterpreter_ppc.cpp | 3038 ++
src/cpu/ppc/vm/cppInterpreter_ppc.hpp | 39 +
src/cpu/ppc/vm/debug_ppc.cpp | 35 +
src/cpu/ppc/vm/depChecker_ppc.hpp | 31 +
src/cpu/ppc/vm/disassembler_ppc.hpp | 37 +
src/cpu/ppc/vm/dump_ppc.cpp | 62 +
src/cpu/ppc/vm/frame_ppc.cpp | 320 +
src/cpu/ppc/vm/frame_ppc.hpp | 534 +
src/cpu/ppc/vm/frame_ppc.inline.hpp | 303 +
src/cpu/ppc/vm/globalDefinitions_ppc.hpp | 40 +
src/cpu/ppc/vm/globals_ppc.hpp | 130 +
src/cpu/ppc/vm/icBuffer_ppc.cpp | 71 +
src/cpu/ppc/vm/icache_ppc.cpp | 77 +
src/cpu/ppc/vm/icache_ppc.hpp | 52 +
src/cpu/ppc/vm/interp_masm_ppc_64.cpp | 2298 +
src/cpu/ppc/vm/interp_masm_ppc_64.hpp | 304 +
src/cpu/ppc/vm/interpreterGenerator_ppc.hpp | 37 +
src/cpu/ppc/vm/interpreterRT_ppc.cpp | 155 +
src/cpu/ppc/vm/interpreterRT_ppc.hpp | 62 +
src/cpu/ppc/vm/interpreter_ppc.cpp | 821 +
src/cpu/ppc/vm/interpreter_ppc.hpp | 50 +
src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp | 78 +
src/cpu/ppc/vm/jniFastGetField_ppc.cpp | 75 +
src/cpu/ppc/vm/jniTypes_ppc.hpp | 110 +
src/cpu/ppc/vm/jni_ppc.h | 55 +
src/cpu/ppc/vm/macroAssembler_ppc.cpp | 3053 ++
src/cpu/ppc/vm/macroAssembler_ppc.hpp | 705 +
src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp | 422 +
src/cpu/ppc/vm/methodHandles_ppc.cpp | 558 +
src/cpu/ppc/vm/methodHandles_ppc.hpp | 64 +
src/cpu/ppc/vm/nativeInst_ppc.cpp | 378 +
src/cpu/ppc/vm/nativeInst_ppc.hpp | 395 +
src/cpu/ppc/vm/ppc.ad | 12869 ++++++++++
src/cpu/ppc/vm/ppc_64.ad | 24 +
src/cpu/ppc/vm/registerMap_ppc.hpp | 45 +
src/cpu/ppc/vm/register_definitions_ppc.cpp | 42 +
src/cpu/ppc/vm/register_ppc.cpp | 77 +
src/cpu/ppc/vm/register_ppc.hpp | 662 +
src/cpu/ppc/vm/relocInfo_ppc.cpp | 139 +
src/cpu/ppc/vm/relocInfo_ppc.hpp | 46 +
src/cpu/ppc/vm/runtime_ppc.cpp | 191 +
src/cpu/ppc/vm/sharedRuntime_ppc.cpp | 3278 ++
src/cpu/ppc/vm/stubGenerator_ppc.cpp | 2119 +
src/cpu/ppc/vm/stubRoutines_ppc_64.cpp | 29 +
src/cpu/ppc/vm/stubRoutines_ppc_64.hpp | 40 +
src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp | 44 +
src/cpu/ppc/vm/templateInterpreter_ppc.cpp | 1874 +
src/cpu/ppc/vm/templateInterpreter_ppc.hpp | 41 +
src/cpu/ppc/vm/templateTable_ppc_64.cpp | 4322 +++
src/cpu/ppc/vm/templateTable_ppc_64.hpp | 38 +
src/cpu/ppc/vm/vmStructs_ppc.hpp | 41 +
src/cpu/ppc/vm/vm_version_ppc.cpp | 492 +
src/cpu/ppc/vm/vm_version_ppc.hpp | 96 +
src/cpu/ppc/vm/vmreg_ppc.cpp | 51 +
src/cpu/ppc/vm/vmreg_ppc.hpp | 35 +
src/cpu/ppc/vm/vmreg_ppc.inline.hpp | 71 +
src/cpu/ppc/vm/vtableStubs_ppc_64.cpp | 269 +
src/cpu/sparc/vm/compile_sparc.hpp | 39 +
src/cpu/sparc/vm/frame_sparc.inline.hpp | 4 +
src/cpu/sparc/vm/globals_sparc.hpp | 5 +
src/cpu/sparc/vm/methodHandles_sparc.hpp | 6 +-
src/cpu/sparc/vm/sharedRuntime_sparc.cpp | 10 +-
src/cpu/sparc/vm/sparc.ad | 28 +-
src/cpu/sparc/vm/vm_version_sparc.cpp | 15 +-
src/cpu/sparc/vm/vm_version_sparc.hpp | 8 +-
src/cpu/x86/vm/assembler_x86.cpp | 14 +-
src/cpu/x86/vm/c2_globals_x86.hpp | 2 +-
src/cpu/x86/vm/compile_x86.hpp | 39 +
src/cpu/x86/vm/frame_x86.inline.hpp | 4 +
src/cpu/x86/vm/globals_x86.hpp | 7 +-
src/cpu/x86/vm/methodHandles_x86.hpp | 6 +-
src/cpu/x86/vm/sharedRuntime_x86_32.cpp | 11 +-
src/cpu/x86/vm/sharedRuntime_x86_64.cpp | 11 +-
src/cpu/x86/vm/stubGenerator_x86_32.cpp | 3 +-
src/cpu/x86/vm/stubGenerator_x86_64.cpp | 6 +-
src/cpu/x86/vm/vm_version_x86.cpp | 5 +
src/cpu/x86/vm/x86_32.ad | 14 +-
src/cpu/x86/vm/x86_64.ad | 75 +-
src/cpu/zero/vm/arm32JIT.cpp | 8583 ++++++
src/cpu/zero/vm/arm_cas.S | 31 +
src/cpu/zero/vm/asm_helper.cpp | 746 +
src/cpu/zero/vm/bytecodes_arm.def | 7850 ++++++
src/cpu/zero/vm/bytecodes_zero.cpp | 52 +-
src/cpu/zero/vm/bytecodes_zero.hpp | 41 +-
src/cpu/zero/vm/compile_zero.hpp | 40 +
src/cpu/zero/vm/cppInterpreter_arm.S | 7390 +++++
src/cpu/zero/vm/cppInterpreter_zero.cpp | 51 +-
src/cpu/zero/vm/cppInterpreter_zero.hpp | 2 +
src/cpu/zero/vm/globals_zero.hpp | 10 +-
src/cpu/zero/vm/methodHandles_zero.hpp | 12 +-
src/cpu/zero/vm/sharedRuntime_zero.cpp | 10 +-
src/cpu/zero/vm/shark_globals_zero.hpp | 1 -
src/cpu/zero/vm/stack_zero.hpp | 2 +-
src/cpu/zero/vm/stack_zero.inline.hpp | 9 +-
src/cpu/zero/vm/vm_version_zero.cpp | 12 +-
src/cpu/zero/vm/vm_version_zero.hpp | 11 +-
src/os/aix/vm/attachListener_aix.cpp | 574 +
src/os/aix/vm/c2_globals_aix.hpp | 37 +
src/os/aix/vm/chaitin_aix.cpp | 38 +
src/os/aix/vm/decoder_aix.hpp | 48 +
src/os/aix/vm/globals_aix.hpp | 63 +
src/os/aix/vm/interfaceSupport_aix.hpp | 35 +
src/os/aix/vm/jsig.c | 233 +
src/os/aix/vm/jvm_aix.cpp | 201 +
src/os/aix/vm/jvm_aix.h | 123 +
src/os/aix/vm/libperfstat_aix.cpp | 124 +
src/os/aix/vm/libperfstat_aix.hpp | 59 +
src/os/aix/vm/loadlib_aix.cpp | 185 +
src/os/aix/vm/loadlib_aix.hpp | 128 +
src/os/aix/vm/mutex_aix.inline.hpp | 37 +
src/os/aix/vm/osThread_aix.cpp | 58 +
src/os/aix/vm/osThread_aix.hpp | 144 +
src/os/aix/vm/os_aix.cpp | 5145 +++
src/os/aix/vm/os_aix.hpp | 381 +
src/os/aix/vm/os_aix.inline.hpp | 294 +
src/os/aix/vm/os_share_aix.hpp | 37 +
src/os/aix/vm/perfMemory_aix.cpp | 1349 +
src/os/aix/vm/porting_aix.cpp | 369 +
src/os/aix/vm/porting_aix.hpp | 81 +
src/os/aix/vm/threadCritical_aix.cpp | 68 +
src/os/aix/vm/thread_aix.inline.hpp | 42 +
src/os/aix/vm/vmError_aix.cpp | 122 +
src/os/bsd/vm/os_bsd.cpp | 10 +-
src/os/linux/vm/decoder_linux.cpp | 6 +
src/os/linux/vm/osThread_linux.cpp | 3 +
src/os/linux/vm/os_linux.cpp | 258 +-
src/os/linux/vm/os_linux.hpp | 3 +
src/os/linux/vm/os_linux.inline.hpp | 3 +
src/os/linux/vm/thread_linux.inline.hpp | 5 +
src/os/posix/launcher/java_md.c | 13 +-
src/os/posix/vm/os_posix.cpp | 491 +-
src/os/posix/vm/os_posix.hpp | 28 +-
src/os/solaris/vm/os_solaris.hpp | 3 +
src/os/windows/vm/os_windows.hpp | 3 +
src/os_cpu/aix_ppc/vm/aix_ppc_64.ad | 24 +
src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp | 401 +
src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp | 54 +
src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp | 151 +
src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp | 567 +
src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp | 35 +
src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp | 58 +
src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp | 40 +
src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp | 36 +
src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp | 36 +
src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp | 79 +
src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp | 66 +
src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp | 8 +-
src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp | 2 +-
src/os_cpu/linux_aarch64/vm/assembler_linux_aarch64.cpp | 53 +
src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp | 144 +
src/os_cpu/linux_aarch64/vm/bytes_linux_aarch64.inline.hpp | 44 +
src/os_cpu/linux_aarch64/vm/copy_linux_aarch64.inline.hpp | 124 +
src/os_cpu/linux_aarch64/vm/globals_linux_aarch64.hpp | 46 +
src/os_cpu/linux_aarch64/vm/linux_aarch64.S | 25 +
src/os_cpu/linux_aarch64/vm/linux_aarch64.ad | 68 +
src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp | 144 +
src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 753 +
src/os_cpu/linux_aarch64/vm/os_linux_aarch64.hpp | 58 +
src/os_cpu/linux_aarch64/vm/os_linux_aarch64.inline.hpp | 39 +
src/os_cpu/linux_aarch64/vm/prefetch_linux_aarch64.inline.hpp | 45 +
src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.cpp | 41 +
src/os_cpu/linux_aarch64/vm/threadLS_linux_aarch64.hpp | 36 +
src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp | 92 +
src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp | 85 +
src/os_cpu/linux_aarch64/vm/vmStructs_linux_aarch64.hpp | 65 +
src/os_cpu/linux_aarch64/vm/vm_version_linux_aarch64.cpp | 28 +
src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp | 401 +
src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp | 39 +
src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp | 54 +
src/os_cpu/linux_ppc/vm/linux_ppc_64.ad | 24 +
src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp | 149 +
src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp | 624 +
src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp | 35 +
src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp | 50 +
src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp | 40 +
src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp | 36 +
src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp | 36 +
src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp | 83 +
src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp | 66 +
src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 2 +-
src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 22 +-
src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 8 +-
src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 43 +-
src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 8 +-
src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp | 242 +-
src/share/tools/hsdis/Makefile | 20 +-
src/share/tools/hsdis/hsdis-demo.c | 9 +-
src/share/tools/hsdis/hsdis.c | 15 +
src/share/vm/adlc/adlparse.cpp | 188 +-
src/share/vm/adlc/adlparse.hpp | 4 +-
src/share/vm/adlc/archDesc.hpp | 2 +
src/share/vm/adlc/formssel.cpp | 89 +-
src/share/vm/adlc/formssel.hpp | 3 +
src/share/vm/adlc/main.cpp | 12 +
src/share/vm/adlc/output_c.cpp | 187 +-
src/share/vm/adlc/output_h.cpp | 41 +-
src/share/vm/asm/assembler.cpp | 36 +-
src/share/vm/asm/assembler.hpp | 29 +-
src/share/vm/asm/codeBuffer.cpp | 15 +-
src/share/vm/asm/codeBuffer.hpp | 9 +-
src/share/vm/c1/c1_Canonicalizer.cpp | 7 +
src/share/vm/c1/c1_Compilation.cpp | 26 +
src/share/vm/c1/c1_Defs.hpp | 6 +
src/share/vm/c1/c1_FpuStackSim.hpp | 3 +
src/share/vm/c1/c1_FrameMap.cpp | 5 +-
src/share/vm/c1/c1_FrameMap.hpp | 3 +
src/share/vm/c1/c1_LIR.cpp | 49 +-
src/share/vm/c1/c1_LIR.hpp | 56 +-
src/share/vm/c1/c1_LIRAssembler.cpp | 7 +
src/share/vm/c1/c1_LIRAssembler.hpp | 6 +
src/share/vm/c1/c1_LIRGenerator.cpp | 10 +-
src/share/vm/c1/c1_LIRGenerator.hpp | 3 +
src/share/vm/c1/c1_LinearScan.cpp | 6 +-
src/share/vm/c1/c1_LinearScan.hpp | 3 +
src/share/vm/c1/c1_MacroAssembler.hpp | 6 +
src/share/vm/c1/c1_Runtime1.cpp | 36 +-
src/share/vm/c1/c1_globals.hpp | 6 +
src/share/vm/ci/ciInstanceKlass.cpp | 31 +-
src/share/vm/ci/ciInstanceKlass.hpp | 6 +-
src/share/vm/ci/ciMethod.cpp | 38 +
src/share/vm/ci/ciMethod.hpp | 2 +
src/share/vm/ci/ciTypeFlow.cpp | 2 +-
src/share/vm/classfile/classFileParser.cpp | 10 +-
src/share/vm/classfile/classFileStream.hpp | 3 +
src/share/vm/classfile/classLoader.cpp | 3 +
src/share/vm/classfile/javaClasses.cpp | 24 +-
src/share/vm/classfile/javaClasses.hpp | 1 +
src/share/vm/classfile/stackMapTable.hpp | 3 +
src/share/vm/classfile/systemDictionary.cpp | 1 -
src/share/vm/classfile/verifier.cpp | 26 +-
src/share/vm/classfile/vmSymbols.hpp | 14 +-
src/share/vm/code/codeBlob.cpp | 3 +
src/share/vm/code/compiledIC.cpp | 13 +-
src/share/vm/code/compiledIC.hpp | 7 +
src/share/vm/code/icBuffer.cpp | 3 +
src/share/vm/code/nmethod.cpp | 29 +-
src/share/vm/code/nmethod.hpp | 7 +-
src/share/vm/code/relocInfo.cpp | 41 +
src/share/vm/code/relocInfo.hpp | 49 +-
src/share/vm/code/stubs.hpp | 3 +
src/share/vm/code/vmreg.hpp | 24 +-
src/share/vm/compiler/compileBroker.cpp | 6 +-
src/share/vm/compiler/disassembler.cpp | 3 +
src/share/vm/compiler/disassembler.hpp | 6 +
src/share/vm/compiler/methodLiveness.cpp | 12 +-
src/share/vm/compiler/oopMap.cpp | 7 +
src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp | 3 +
src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp | 3 +
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 28 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 18 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp | 3 +
src/share/vm/gc_implementation/g1/concurrentMark.cpp | 2 +-
src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp | 3 +
src/share/vm/gc_implementation/g1/g1AllocRegion.hpp | 7 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 2 +-
src/share/vm/gc_implementation/g1/g1MarkSweep.cpp | 11 +
src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp | 1 +
src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp | 13 +-
src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp | 2 +-
src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 2 +-
src/share/vm/gc_implementation/g1/ptrQueue.cpp | 3 +
src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 15 +-
src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp | 5 +-
src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 12 +
src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp | 1 -
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 20 +-
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp | 7 +-
src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp | 1 +
src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 27 +
src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp | 3 +
src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp | 3 +
src/share/vm/gc_interface/collectedHeap.cpp | 3 +
src/share/vm/gc_interface/collectedHeap.inline.hpp | 3 +
src/share/vm/interpreter/abstractInterpreter.hpp | 18 +-
src/share/vm/interpreter/bytecode.hpp | 3 +
src/share/vm/interpreter/bytecodeInterpreter.cpp | 996 +-
src/share/vm/interpreter/bytecodeInterpreter.hpp | 31 +-
src/share/vm/interpreter/bytecodeInterpreter.inline.hpp | 3 +
src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp | 305 +
src/share/vm/interpreter/bytecodeStream.hpp | 3 +
src/share/vm/interpreter/bytecodes.cpp | 3 +
src/share/vm/interpreter/bytecodes.hpp | 4 +
src/share/vm/interpreter/cppInterpreter.hpp | 3 +
src/share/vm/interpreter/cppInterpreterGenerator.hpp | 3 +
src/share/vm/interpreter/interpreter.hpp | 3 +
src/share/vm/interpreter/interpreterGenerator.hpp | 3 +
src/share/vm/interpreter/interpreterRuntime.cpp | 47 +-
src/share/vm/interpreter/interpreterRuntime.hpp | 27 +-
src/share/vm/interpreter/invocationCounter.hpp | 22 +-
src/share/vm/interpreter/linkResolver.cpp | 3 +
src/share/vm/interpreter/templateInterpreter.hpp | 3 +
src/share/vm/interpreter/templateInterpreterGenerator.hpp | 3 +
src/share/vm/interpreter/templateTable.cpp | 5 +
src/share/vm/interpreter/templateTable.hpp | 20 +-
src/share/vm/libadt/port.hpp | 5 +-
src/share/vm/memory/allocation.cpp | 3 +
src/share/vm/memory/allocation.hpp | 37 +-
src/share/vm/memory/allocation.inline.hpp | 8 +-
src/share/vm/memory/barrierSet.hpp | 4 +-
src/share/vm/memory/barrierSet.inline.hpp | 6 +-
src/share/vm/memory/cardTableModRefBS.cpp | 4 +-
src/share/vm/memory/cardTableModRefBS.hpp | 11 +-
src/share/vm/memory/collectorPolicy.cpp | 23 +-
src/share/vm/memory/defNewGeneration.cpp | 16 +-
src/share/vm/memory/gcLocker.hpp | 4 +
src/share/vm/memory/genMarkSweep.cpp | 3 +
src/share/vm/memory/generation.cpp | 12 +
src/share/vm/memory/modRefBarrierSet.hpp | 2 +-
src/share/vm/memory/resourceArea.cpp | 3 +
src/share/vm/memory/resourceArea.hpp | 3 +
src/share/vm/memory/space.hpp | 3 +
src/share/vm/memory/tenuredGeneration.cpp | 12 +
src/share/vm/memory/threadLocalAllocBuffer.cpp | 3 +
src/share/vm/memory/universe.cpp | 13 +-
src/share/vm/oops/constantPoolKlass.cpp | 3 +
src/share/vm/oops/constantPoolOop.hpp | 3 +
src/share/vm/oops/cpCacheOop.cpp | 4 +-
src/share/vm/oops/cpCacheOop.hpp | 22 +-
src/share/vm/oops/instanceKlass.cpp | 26 +-
src/share/vm/oops/instanceKlass.hpp | 5 +
src/share/vm/oops/markOop.cpp | 3 +
src/share/vm/oops/methodDataOop.cpp | 6 +
src/share/vm/oops/methodDataOop.hpp | 191 +
src/share/vm/oops/methodOop.cpp | 16 +
src/share/vm/oops/methodOop.hpp | 11 +-
src/share/vm/oops/objArrayKlass.inline.hpp | 4 +-
src/share/vm/oops/oop.cpp | 3 +
src/share/vm/oops/oop.inline.hpp | 19 +-
src/share/vm/oops/oopsHierarchy.cpp | 3 +
src/share/vm/oops/typeArrayOop.hpp | 6 +
src/share/vm/opto/block.cpp | 359 +-
src/share/vm/opto/block.hpp | 8 +-
src/share/vm/opto/buildOopMap.cpp | 3 +
src/share/vm/opto/bytecodeInfo.cpp | 44 +-
src/share/vm/opto/c2_globals.hpp | 28 +-
src/share/vm/opto/c2compiler.cpp | 19 +-
src/share/vm/opto/callGenerator.cpp | 64 +-
src/share/vm/opto/callGenerator.hpp | 1 +
src/share/vm/opto/callnode.cpp | 85 +-
src/share/vm/opto/callnode.hpp | 68 +-
src/share/vm/opto/cfgnode.cpp | 4 +-
src/share/vm/opto/chaitin.cpp | 13 +-
src/share/vm/opto/coalesce.cpp | 4 +-
src/share/vm/opto/compile.cpp | 147 +-
src/share/vm/opto/compile.hpp | 48 +-
src/share/vm/opto/doCall.cpp | 14 +-
src/share/vm/opto/escape.cpp | 80 +-
src/share/vm/opto/gcm.cpp | 11 +-
src/share/vm/opto/generateOptoStub.cpp | 120 +-
src/share/vm/opto/graphKit.cpp | 67 +-
src/share/vm/opto/graphKit.hpp | 46 +-
src/share/vm/opto/idealGraphPrinter.cpp | 4 +-
src/share/vm/opto/idealKit.cpp | 8 +-
src/share/vm/opto/idealKit.hpp | 3 +-
src/share/vm/opto/ifnode.cpp | 2 +-
src/share/vm/opto/lcm.cpp | 46 +-
src/share/vm/opto/library_call.cpp | 32 +-
src/share/vm/opto/locknode.hpp | 10 +-
src/share/vm/opto/loopPredicate.cpp | 4 +-
src/share/vm/opto/loopTransform.cpp | 25 +-
src/share/vm/opto/machnode.cpp | 14 +
src/share/vm/opto/machnode.hpp | 28 +
src/share/vm/opto/macro.cpp | 97 +-
src/share/vm/opto/macro.hpp | 3 +-
src/share/vm/opto/matcher.cpp | 77 +-
src/share/vm/opto/matcher.hpp | 5 +
src/share/vm/opto/memnode.cpp | 705 +-
src/share/vm/opto/memnode.hpp | 181 +-
src/share/vm/opto/multnode.cpp | 33 +-
src/share/vm/opto/multnode.hpp | 2 +
src/share/vm/opto/node.cpp | 45 +-
src/share/vm/opto/node.hpp | 15 +-
src/share/vm/opto/output.cpp | 27 +-
src/share/vm/opto/output.hpp | 10 +-
src/share/vm/opto/parse.hpp | 15 +-
src/share/vm/opto/parse1.cpp | 13 +-
src/share/vm/opto/parse2.cpp | 16 +-
src/share/vm/opto/parse3.cpp | 70 +-
src/share/vm/opto/parseHelper.cpp | 5 +
src/share/vm/opto/phase.cpp | 2 +
src/share/vm/opto/phase.hpp | 1 +
src/share/vm/opto/phaseX.cpp | 2 +-
src/share/vm/opto/phasetype.hpp | 8 +-
src/share/vm/opto/postaloc.cpp | 7 +-
src/share/vm/opto/regalloc.cpp | 4 +-
src/share/vm/opto/regmask.cpp | 10 +-
src/share/vm/opto/regmask.hpp | 10 +-
src/share/vm/opto/runtime.cpp | 33 +-
src/share/vm/opto/stringopts.cpp | 8 +-
src/share/vm/opto/type.cpp | 65 +-
src/share/vm/opto/type.hpp | 35 +-
src/share/vm/opto/vectornode.hpp | 2 +-
src/share/vm/prims/forte.cpp | 8 +-
src/share/vm/prims/jni.cpp | 90 +-
src/share/vm/prims/jniCheck.cpp | 45 +-
src/share/vm/prims/jni_md.h | 3 +
src/share/vm/prims/jvm.cpp | 3 +
src/share/vm/prims/jvm.h | 3 +
src/share/vm/prims/jvmtiClassFileReconstituter.cpp | 3 +
src/share/vm/prims/jvmtiEnv.cpp | 6 +
src/share/vm/prims/jvmtiExport.cpp | 41 +
src/share/vm/prims/jvmtiExport.hpp | 7 +
src/share/vm/prims/jvmtiImpl.cpp | 3 +
src/share/vm/prims/jvmtiManageCapabilities.cpp | 4 +-
src/share/vm/prims/jvmtiTagMap.cpp | 8 +-
src/share/vm/prims/methodHandles.cpp | 4 +-
src/share/vm/prims/methodHandles.hpp | 3 +
src/share/vm/prims/nativeLookup.cpp | 3 +
src/share/vm/prims/unsafe.cpp | 36 +-
src/share/vm/prims/whitebox.cpp | 2 +-
src/share/vm/runtime/advancedThresholdPolicy.cpp | 2 +-
src/share/vm/runtime/arguments.cpp | 88 +-
src/share/vm/runtime/atomic.cpp | 9 +
src/share/vm/runtime/biasedLocking.cpp | 6 +-
src/share/vm/runtime/deoptimization.cpp | 13 +-
src/share/vm/runtime/dtraceJSDT.hpp | 3 +
src/share/vm/runtime/fprofiler.hpp | 3 +
src/share/vm/runtime/frame.cpp | 18 +-
src/share/vm/runtime/frame.hpp | 19 +-
src/share/vm/runtime/frame.inline.hpp | 13 +
src/share/vm/runtime/globals.hpp | 53 +-
src/share/vm/runtime/handles.cpp | 4 +
src/share/vm/runtime/handles.inline.hpp | 3 +
src/share/vm/runtime/icache.hpp | 3 +
src/share/vm/runtime/interfaceSupport.hpp | 6 +
src/share/vm/runtime/java.cpp | 6 +
src/share/vm/runtime/javaCalls.cpp | 3 +
src/share/vm/runtime/javaCalls.hpp | 6 +
src/share/vm/runtime/javaFrameAnchor.hpp | 9 +
src/share/vm/runtime/jniHandles.cpp | 3 +
src/share/vm/runtime/memprofiler.cpp | 3 +
src/share/vm/runtime/mutex.cpp | 4 +
src/share/vm/runtime/mutexLocker.cpp | 3 +
src/share/vm/runtime/mutexLocker.hpp | 3 +
src/share/vm/runtime/objectMonitor.cpp | 47 +-
src/share/vm/runtime/os.cpp | 45 +-
src/share/vm/runtime/os.hpp | 22 +-
src/share/vm/runtime/osThread.hpp | 3 +
src/share/vm/runtime/registerMap.hpp | 6 +
src/share/vm/runtime/relocator.hpp | 3 +
src/share/vm/runtime/safepoint.cpp | 9 +-
src/share/vm/runtime/sharedRuntime.cpp | 95 +-
src/share/vm/runtime/sharedRuntime.hpp | 27 +-
src/share/vm/runtime/sharedRuntimeTrans.cpp | 4 +
src/share/vm/runtime/sharedRuntimeTrig.cpp | 7 +
src/share/vm/runtime/stackValueCollection.cpp | 3 +
src/share/vm/runtime/statSampler.cpp | 3 +
src/share/vm/runtime/stubCodeGenerator.cpp | 3 +
src/share/vm/runtime/stubRoutines.cpp | 14 +
src/share/vm/runtime/stubRoutines.hpp | 71 +-
src/share/vm/runtime/sweeper.cpp | 3 +-
src/share/vm/runtime/synchronizer.cpp | 17 +-
src/share/vm/runtime/task.cpp | 4 +
src/share/vm/runtime/thread.cpp | 7 +
src/share/vm/runtime/thread.hpp | 35 +-
src/share/vm/runtime/threadLocalStorage.cpp | 4 +
src/share/vm/runtime/threadLocalStorage.hpp | 6 +
src/share/vm/runtime/timer.cpp | 3 +
src/share/vm/runtime/vframe.cpp | 3 +-
src/share/vm/runtime/vframeArray.cpp | 2 +-
src/share/vm/runtime/virtualspace.cpp | 3 +
src/share/vm/runtime/vmStructs.cpp | 27 +-
src/share/vm/runtime/vmThread.cpp | 3 +
src/share/vm/runtime/vmThread.hpp | 3 +
src/share/vm/runtime/vm_operations.cpp | 3 +
src/share/vm/runtime/vm_version.cpp | 13 +-
src/share/vm/shark/sharkCompiler.cpp | 6 +-
src/share/vm/shark/shark_globals.hpp | 10 +
src/share/vm/trace/trace.dtd | 3 -
src/share/vm/utilities/accessFlags.cpp | 3 +
src/share/vm/utilities/array.cpp | 3 +
src/share/vm/utilities/bitMap.cpp | 3 +
src/share/vm/utilities/bitMap.hpp | 2 +-
src/share/vm/utilities/bitMap.inline.hpp | 20 +-
src/share/vm/utilities/copy.hpp | 3 +
src/share/vm/utilities/debug.cpp | 4 +
src/share/vm/utilities/debug.hpp | 2 +-
src/share/vm/utilities/decoder.cpp | 4 +
src/share/vm/utilities/decoder_elf.cpp | 2 +-
src/share/vm/utilities/decoder_elf.hpp | 4 +-
src/share/vm/utilities/elfFile.cpp | 57 +-
src/share/vm/utilities/elfFile.hpp | 8 +-
src/share/vm/utilities/elfFuncDescTable.cpp | 104 +
src/share/vm/utilities/elfFuncDescTable.hpp | 149 +
src/share/vm/utilities/elfStringTable.cpp | 4 +-
src/share/vm/utilities/elfStringTable.hpp | 2 +-
src/share/vm/utilities/elfSymbolTable.cpp | 38 +-
src/share/vm/utilities/elfSymbolTable.hpp | 6 +-
src/share/vm/utilities/events.cpp | 3 +
src/share/vm/utilities/exceptions.cpp | 3 +
src/share/vm/utilities/globalDefinitions.hpp | 14 +
src/share/vm/utilities/globalDefinitions_gcc.hpp | 8 -
src/share/vm/utilities/globalDefinitions_sparcWorks.hpp | 9 -
src/share/vm/utilities/globalDefinitions_xlc.hpp | 194 +
src/share/vm/utilities/growableArray.cpp | 3 +
src/share/vm/utilities/histogram.hpp | 3 +
src/share/vm/utilities/macros.hpp | 56 +-
src/share/vm/utilities/ostream.cpp | 7 +-
src/share/vm/utilities/preserveException.hpp | 3 +
src/share/vm/utilities/taskqueue.cpp | 3 +
src/share/vm/utilities/taskqueue.hpp | 117 +-
src/share/vm/utilities/vmError.cpp | 25 +-
src/share/vm/utilities/vmError.hpp | 8 +
src/share/vm/utilities/workgroup.hpp | 3 +
test/compiler/6934604/TestByteBoxing.java | 777 +
test/compiler/6934604/TestDoubleBoxing.java | 777 +
test/compiler/6934604/TestFloatBoxing.java | 777 +
test/compiler/6934604/TestIntBoxing.java | 777 +
test/compiler/6934604/TestLongBoxing.java | 777 +
test/compiler/6934604/TestShortBoxing.java | 777 +
test/compiler/codegen/IntRotateWithImmediate.java | 78 +
test/compiler/loopopts/ConstFPVectorization.java | 63 +
test/compiler/stringopts/TestStringObjectInitialization.java | 78 +
test/compiler/unsafe/JdkInternalMiscUnsafeUnalignedAccess.java | 315 +
test/runtime/7020373/GenOOMCrashClass.java | 157 +
test/runtime/7020373/Test7020373.sh | 4 +
test/runtime/7020373/testcase.jar | Bin
test/runtime/InitialThreadOverflow/DoOverflow.java | 41 +
test/runtime/InitialThreadOverflow/invoke.cxx | 70 +
test/runtime/InitialThreadOverflow/testme.sh | 73 +
test/runtime/RedefineFinalizer/RedefineFinalizer.java | 64 +
test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java | 143 +
test/runtime/stackMapCheck/BadMap.jasm | 152 +
test/runtime/stackMapCheck/BadMapDstore.jasm | 79 +
test/runtime/stackMapCheck/BadMapIstore.jasm | 79 +
test/runtime/stackMapCheck/StackMapCheck.java | 63 +
test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java | 82 +
test/serviceability/jvmti/UnresolvedClassAgent.java | 69 +
test/serviceability/jvmti/UnresolvedClassAgent.mf | 3 +
test/testlibrary/RedefineClassHelper.java | 79 +
test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java | 81 +-
test/testlibrary/com/oracle/java/testlibrary/Utils.java | 263 +
test/testlibrary_tests/RedefineClassTest.java | 54 +
tools/mkbc.c | 607 +
709 files changed, 158201 insertions(+), 1852 deletions(-)
diffs (truncated from 172780 to 500 lines):
diff -r 9efa3fae3c27 -r 75297b84957e .hgtags
--- a/.hgtags Wed Jul 20 04:05:08 2016 +0100
+++ b/.hgtags Thu Jul 28 14:59:45 2016 +0100
@@ -50,6 +50,7 @@
faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12
9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
@@ -87,6 +88,7 @@
07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88
+a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13
15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89
4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02
605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90
@@ -160,6 +162,7 @@
b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05
bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136
bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06
+591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14
2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137
2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07
0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138
@@ -182,6 +185,7 @@
38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
+7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint
9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
@@ -210,6 +214,7 @@
3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10
f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13
0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21
+f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint
a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02
6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03
8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04
@@ -264,6 +269,7 @@
f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint
efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13
82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14
e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01
@@ -302,6 +308,9 @@
e974e15945658e574e6c344c4a7ba225f5708c10 hs23.2-b03
f08a3a0e60c32cb0e8350e72fdc54849759096a4 jdk7u6-b12
7a8d3cd6562170f4c262e962270f679ac503f456 hs23.2-b04
+d72dd66fdc3d52aee909f8dd8f25f62f13569ffa ppc-aix-port-b01
+1efaab66c81d0a5701cc819e67376f1b27bfea47 ppc-aix-port-b02
+b69b779a26dfc5e2333504d0c82fc998ff915499 ppc-aix-port-b03
28746e6d615f27816f483485a53b790c7a463f0c jdk7u6-b13
202880d633e646d4936798d0fba6efc0cab04dc8 hs23.2-b05
6b0f178141388f5721aa5365cb542715acbf0cc7 jdk7u6-b14
@@ -311,6 +320,7 @@
cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16
270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08
7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17
+354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint
df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18
1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19
a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09
@@ -440,6 +450,7 @@
4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07
3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08
92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09
+6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint
7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29
181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10
4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30
@@ -496,6 +507,7 @@
273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32
e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
+ca298f18e21dc66c6b5235600f8b50bcc9bbaa38 ppc-aix-port-b04
12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
be21f8a4d42c03cafde4f616fd80ece791ba2f21 hs24-b35
10e0043bda0878dbc85f3f280157eab592b47c91 jdk7u14-b16
@@ -590,6 +602,9 @@
12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31
+ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
+af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
+cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
c373a733d5d5147f99eaa2b91d6b937c28214fc9 jdk7u45-b33
0bcb43482f2ac5615437541ffb8dc0f79ece3148 jdk7u45-b34
12ea8d416f105f5971c808c89dddc1006bfc4c53 jdk7u45-b35
@@ -646,6 +661,8 @@
0025a2a965c8f21376278245c2493d8861386fba jdk7u60-b02
fa59add77d1a8f601a695f137248462fdc68cc2f hs24.60-b05
a59134ccb1b704b2cd05e157970d425af43e5437 hs24.60-b06
+bc178be7e9d6fcc97e09c909ffe79d96e2305218 icedtea-2.5pre01
+f30e87f16d90f1e659b935515a3fc083ab8a0156 icedtea-2.5pre02
2c971ed884cec0a9293ccff3def696da81823225 jdk7u60-b03
1afbeb8cb558429156d432f35e7582716053a9cb hs24.60-b07
05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u60-b04
@@ -810,13 +827,36 @@
ff18bcebe2943527cdbc094375c38c27ec7f2442 hs24.80-b03
1b9722b5134a8e565d8b8fe851849e034beff057 hs24.80-b04
04d6919c44db8c9d811ef0ac4775a579f854cdfc hs24.80-b05
+882a93010fb90f928331bf31a226992755d6cfb2 icedtea-2.6pre01
ee18e60e7e8da9f1912895af353564de0330a2b1 hs24.80-b06
+138ef7288fd40de0012a3a24839fa7cb3569ab43 icedtea-2.6pre02
+4ab69c6e4c85edf628c01c685bc12c591b9807d9 icedtea-2.6pre03
+b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14
+2fd819c8b5066a480f9524d901dbd34f2cf563ad icedtea-2.6pre04
+fae3b09fe959294f7a091a6ecaae91daf1cb4f5c icedtea-2.6pre05
05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u80-b00
e2533d62ca887078e4b952a75a75680cfb7894b9 jdk7u80-b01
+8ffb87775f56ed5c602f320d2513351298ee4778 icedtea-2.6pre07
+b517477362d1b0d4f9b567c82db85136fd14bc6e icedtea-2.6pre06
+6d5ec408f4cac2c2004bf6120403df1b18051a21 icedtea-2.6pre08
bad107a5d096b070355c5a2d80aa50bc5576144b jdk7u80-b02
+4722cfd15c8386321c8e857951b3cb55461e858b icedtea-2.6pre09
+c8417820ac943736822e7b84518b5aca80f39593 icedtea-2.6pre10
+e13857ecc7870c28dbebca79ff36612693dac157 icedtea-2.6pre11
9d2b485d2a58ea57ab2b3c06b2128f456ab39a38 jdk7u80-b03
+0c2099cd04cd24778c5baccc7c8a72c311ef6f84 icedtea-2.6pre12
+c6fa18ed8a01a15e1210bf44dc7075463e0a514b icedtea-2.6pre13
+1d3d9e81c8e16bfe948da9bc0756e922a3802ca4 icedtea-2.6pre14
+5ad4c09169742e076305193c1e0b8256635cf33e icedtea-2.6pre15
+7891f0e7ae10d8f636fdbf29bcfe06f43d057e5f icedtea-2.6pre16
+4d25046abb67ae570ae1dbb5e3e48e7a63d93b88 icedtea-2.6pre17
a89267b51c40cba0b26fe84831478389723c8321 jdk7u80-b04
00402b4ff7a90a6deba09816192e335cadfdb4f0 jdk7u80-b05
+1792bfb4a54d87ff87438413a34004a6b6004987 icedtea-2.6pre18
+8f3c9cf0636f4d40e9c3647e03c7d0ca6d1019ee icedtea-2.6pre19
+904317834a259bdddd4568b74874c2472f119a3c icedtea-2.6pre20
+1939c010fd371d22de5c1baf2583a96e8f38da44 icedtea-2.6pre21
+cb42e88f9787c8aa28662f31484d605e550c6d53 icedtea-2.6pre22
87d4354a3ce8aafccf1f1cd9cb9d88a58731dde8 jdk7u80-b06
d496bd71dc129828c2b5962e2072cdb591454e4a jdk7u80-b07
5ce33a4444cf74e04c22fb11b1e1b76b68a6477a jdk7u80-b08
@@ -829,13 +869,28 @@
27e0103f3b11f06bc3277914564ed9a1976fb3d5 jdk7u80-b30
426e09df7eda980317d1308af15c29ef691cd471 jdk7u80-b15
198c700d102cc2051b304fc382ac58c5d76e8d26 jdk7u80-b32
-ea2051eb6ee8be8e292711caaae05a7014466ddc jdk7u85-b00
-1c6c2bdf4321c0ece7723663341f7f1a35cac843 jdk7u85-b01
+1afefe2d5f90112e87034a4eac57fdad53fe5b9f icedtea-2.6pre23
+94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6pre24
+94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6.0
+501fc984fa3b3d51e1a7f1220f2de635a2b370b9 jdk7u85-b00
+3f1b4a1fe4a274cd1f89d9ec83d8018f7f4b7d01 jdk7u85-b01
+94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6-branchpoint
+b19bc5aeaa099ac73ee8341e337a007180409593 icedtea-2.6.1
e45a07be1cac074dfbde6757f64b91f0608f30fb jdk7u85-b02
+25077ae8f6d2c512e74bfb3e5c1ed511b7c650de icedtea-2.6.2pre01
+1500c88d1b61914b3fbe7dfd8c521038bd95bde3 icedtea-2.6.2pre02
cce12560430861a962349343b61d3a9eb12c6571 jdk7u91-b00
5eaaa63440c4416cd9c03d586f72b3be8c7c73f8 jdk7u91-b01
+f40363c111917466319901436650f22f8403b749 icedtea-2.6.2
2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02
+c3cde6774003850aa6c44315c9c3e4dfdac69798 icedtea-2.6.3
b3c5ff648bcad305163b323ad15dde1b6234d501 jdk7u95-b00
+19d919ae5506a750e3a0bcc6bd176c66b7e1e65d icedtea-2.6.4
631da593499ee184ea8efb2bc5491e0d99ac636d jdk7u99-b00
+04d7046d2d41ae18c762fbdad7e114fdd55e2282 icedtea-2.6.5
+825fa447453ad85b3a6f11f87c5147b8b78fb3ab icedtea-2.6.6pre01
6e42747134be8a4a366d337da1fc84a847ad8381 jdk7u101-b00
+3022a3d80efd705e861b90cece4f6fdc73f6de97 icedtea-2.6.6
+b4a17ff67e26e5e64680ab68c398dbecc46ee7c4 icedtea-2.6.7pre01
14d0f4da4a74897fc3274f8f549f41544bb4625a jdk7u111-b00
+9efa3fae3c278a7f48badec775d7f9b2d5320b6d jdk7u111-b01
diff -r 9efa3fae3c27 -r 75297b84957e .jcheck/conf
--- a/.jcheck/conf Wed Jul 20 04:05:08 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 9efa3fae3c27 -r 75297b84957e agent/src/os/linux/LinuxDebuggerLocal.c
--- a/agent/src/os/linux/LinuxDebuggerLocal.c Wed Jul 20 04:05:08 2016 +0100
+++ b/agent/src/os/linux/LinuxDebuggerLocal.c Thu Jul 28 14:59:45 2016 +0100
@@ -23,6 +23,7 @@
*/
#include <jni.h>
+#include <stdlib.h>
#include "libproc.h"
#if defined(x86_64) && !defined(amd64)
@@ -73,7 +74,7 @@
(JNIEnv *env, jclass cls) {
jclass listClass;
- if (init_libproc(getenv("LIBSAPROC_DEBUG")) != true) {
+ if (init_libproc(getenv("LIBSAPROC_DEBUG") != NULL) != true) {
THROW_NEW_DEBUGGER_EXCEPTION("can't initialize libproc");
}
diff -r 9efa3fae3c27 -r 75297b84957e agent/src/os/linux/Makefile
--- a/agent/src/os/linux/Makefile Wed Jul 20 04:05:08 2016 +0100
+++ b/agent/src/os/linux/Makefile Thu Jul 28 14:59:45 2016 +0100
@@ -23,7 +23,12 @@
#
ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
-GCC = gcc
+
+ifndef BUILD_GCC
+BUILD_GCC = gcc
+endif
+
+GCC = $(BUILD_GCC)
JAVAH = ${JAVA_HOME}/bin/javah
@@ -40,7 +45,7 @@
LIBS = -lthread_db
-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64
+CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64
LIBSA = $(ARCH)/libsaproc.so
@@ -73,7 +78,7 @@
$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
test.o: test.c
- $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
+ $(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c
test: test.o
$(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
diff -r 9efa3fae3c27 -r 75297b84957e agent/src/os/linux/libproc.h
--- a/agent/src/os/linux/libproc.h Wed Jul 20 04:05:08 2016 +0100
+++ b/agent/src/os/linux/libproc.h Thu Jul 28 14:59:45 2016 +0100
@@ -34,7 +34,7 @@
#include "libproc_md.h"
#endif
-#include <linux/ptrace.h>
+#include <sys/ptrace.h>
/************************************************************************************
@@ -76,7 +76,7 @@
};
#endif
-#if defined(sparc) || defined(sparcv9)
+#if defined(sparc) || defined(sparcv9) || defined(ppc64)
#define user_regs_struct pt_regs
#endif
diff -r 9efa3fae3c27 -r 75297b84957e agent/src/os/linux/ps_proc.c
--- a/agent/src/os/linux/ps_proc.c Wed Jul 20 04:05:08 2016 +0100
+++ b/agent/src/os/linux/ps_proc.c Thu Jul 28 14:59:45 2016 +0100
@@ -27,6 +27,8 @@
#include <string.h>
#include <signal.h>
#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/ptrace.h>
#include "libproc_impl.h"
@@ -261,7 +263,7 @@
static bool read_lib_info(struct ps_prochandle* ph) {
char fname[32];
- char buf[256];
+ char buf[PATH_MAX];
FILE *fp = NULL;
sprintf(fname, "/proc/%d/maps", ph->pid);
@@ -271,10 +273,52 @@
return false;
}
- while(fgets_no_cr(buf, 256, fp)){
- char * word[6];
- int nwords = split_n_str(buf, 6, word, ' ', '\0');
- if (nwords > 5 && find_lib(ph, word[5]) == false) {
+ while(fgets_no_cr(buf, PATH_MAX, fp)){
+ char * word[7];
+ int nwords = split_n_str(buf, 7, word, ' ', '\0');
+
+ if (nwords < 6) {
+ // not a shared library entry. ignore.
+ continue;
+ }
+
+ if (word[5][0] == '[') {
+ // not a shared library entry. ignore.
+ if (strncmp(word[5],"[stack",6) == 0) {
+ continue;
+ }
+ if (strncmp(word[5],"[heap]",6) == 0) {
+ continue;
+ }
+
+ // SA don't handle VDSO
+ if (strncmp(word[5],"[vdso]",6) == 0) {
+ continue;
+ }
+ if (strncmp(word[5],"[vsyscall]",6) == 0) {
+ continue;
+ }
+ }
+
+ if (nwords > 6) {
+ // prelink altered mapfile when the program is running.
+ // Entries like one below have to be skipped
+ // /lib64/libc-2.15.so (deleted)
+ // SO name in entries like one below have to be stripped.
+ // /lib64/libpthread-2.15.so.#prelink#.EECVts
+ char *s = strstr(word[5],".#prelink#");
+ if (s == NULL) {
+ // No prelink keyword. skip deleted library
+ print_debug("skip shared object %s deleted by prelink\n", word[5]);
+ continue;
+ }
+
+ // Fall through
+ print_debug("rectifing shared object name %s changed by prelink\n", word[5]);
+ *s = 0;
+ }
+
+ if (find_lib(ph, word[5]) == false) {
intptr_t base;
lib_info* lib;
#ifdef _LP64
diff -r 9efa3fae3c27 -r 75297b84957e agent/src/os/linux/salibelf.c
--- a/agent/src/os/linux/salibelf.c Wed Jul 20 04:05:08 2016 +0100
+++ b/agent/src/os/linux/salibelf.c Thu Jul 28 14:59:45 2016 +0100
@@ -25,6 +25,7 @@
#include "salibelf.h"
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
extern void print_debug(const char*,...);
diff -r 9efa3fae3c27 -r 75297b84957e agent/src/os/linux/symtab.c
--- a/agent/src/os/linux/symtab.c Wed Jul 20 04:05:08 2016 +0100
+++ b/agent/src/os/linux/symtab.c Thu Jul 28 14:59:45 2016 +0100
@@ -305,7 +305,7 @@
unsigned char *bytes
= (unsigned char*)(note+1) + note->n_namesz;
- unsigned char *filename
+ char *filename
= (build_id_to_debug_filename (note->n_descsz, bytes));
fd = pathmap_open(filename);
diff -r 9efa3fae3c27 -r 75297b84957e make/Makefile
--- a/make/Makefile Wed Jul 20 04:05:08 2016 +0100
+++ b/make/Makefile Thu Jul 28 14:59:45 2016 +0100
@@ -85,6 +85,7 @@
# Typical C1/C2 targets made available with this Makefile
C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
C2_VM_TARGETS=product fastdebug optimized jvmg
+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
@@ -127,6 +128,12 @@
all_debugshark: jvmgshark docs export_debug
all_optimizedshark: optimizedshark docs export_optimized
+allcore: all_productcore all_fastdebugcore
+all_productcore: productcore docs export_product
+all_fastdebugcore: fastdebugcore docs export_fastdebug
+all_debugcore: jvmgcore docs export_debug
+all_optimizedcore: optimizedcore docs export_optimized
+
# Do everything
world: all create_jdk
@@ -151,6 +158,10 @@
$(CD) $(GAMMADIR)/make; \
$(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
+$(CORE_VM_TARGETS):
+ $(CD) $(GAMMADIR)/make; \
+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
+
$(ZERO_VM_TARGETS):
$(CD) $(GAMMADIR)/make; \
$(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \
@@ -203,6 +214,12 @@
$(MAKE_ARGS) $(VM_TARGET)
endif
+generic_buildcore:
+ $(MKDIR) -p $(OUTPUTDIR)
+ $(CD) $(OUTPUTDIR); \
+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
+ $(MAKE_ARGS) $(VM_TARGET)
+
generic_buildzero:
$(MKDIR) -p $(OUTPUTDIR)
$(CD) $(OUTPUTDIR); \
@@ -257,10 +274,12 @@
C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
+CORE_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
+CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR)
ifeq ($(JVM_VARIANT_SERVER), true)
MISC_DIR=$(C2_DIR)
@@ -278,6 +297,10 @@
MISC_DIR=$(ZERO_DIR)
GEN_DIR=$(ZERO_BASE_DIR)/generated
endif
+ifeq ($(JVM_VARIANT_CORE), true)
+ MISC_DIR=$(CORE_DIR)
+ GEN_DIR=$(CORE_BASE_DIR)/generated
+endif
# Bin files (windows)
ifeq ($(OSNAME),windows)
@@ -387,6 +410,20 @@
$(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz
$(install-file)
endif
+ ifeq ($(JVM_VARIANT_CORE), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo
+ $(install-file)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_DIR)/%.diz
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.diz: $(CORE_DIR)/%.diz
+ $(install-file)
+ endif
endif
# Jar file (sa-jdi.jar)
diff -r 9efa3fae3c27 -r 75297b84957e make/aix/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/aix/Makefile Thu Jul 28 14:59:45 2016 +0100
@@ -0,0 +1,380 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2012, 2013 SAP AG. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+# This makefile creates a build tree and lights off a build.
+# You can go back into the build tree and perform rebuilds or
+# incremental builds as desired. Be sure to reestablish
+# environment variable settings for LD_LIBRARY_PATH and JAVA_HOME.
+
+# The make process now relies on java and javac. These can be
+# specified either implicitly on the PATH, by setting the
+# (JDK-inherited) ALT_BOOTDIR environment variable to full path to a
+# JDK in which bin/java and bin/javac are present and working (e.g.,
+# /usr/local/java/jdk1.3/solaris), or via the (JDK-inherited)
+# default BOOTDIR path value. Note that one of ALT_BOOTDIR
+# or BOOTDIR has to be set. We do *not* search javac, javah, rmic etc.
+# from the PATH.
+#
+# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
+# an architecture that differs from the target architecture, as long
+# as the bootstrap jdk runs under the same flavor of OS as the target
+# (i.e., if the target is linux, point to a jdk that runs on a linux
+# box). In order to use such a bootstrap jdk, set the make variable
+# REMOTE to the desired remote command mechanism, e.g.,
+#
+# make REMOTE="rsh -l me myotherlinuxbox"
+
More information about the distro-pkg-dev
mailing list