changeset 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents 8db6e76cb658
children 954c9df6ac79
files .hgtags THIRD_PARTY_README agent/make/Makefile agent/make/mkinstall agent/make/saenv.sh agent/make/saenv64.sh agent/src/os/linux/libproc.h agent/src/os/linux/libproc_impl.c agent/src/os/linux/salibelf.c agent/src/os/linux/symtab.c agent/src/os/solaris/proc/saproc.cpp agent/src/os/win32/windbg/sawindbg.cpp agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java agent/src/share/classes/sun/jvm/hotspot/HSDB.java agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java agent/src/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java agent/src/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayTypeImpl.java agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java agent/src/share/classes/sun/jvm/hotspot/jdi/InterfaceTypeImpl.java agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java agent/src/share/classes/sun/jvm/hotspot/oops/MethodCounters.java agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java agent/src/share/classes/sun/jvm/hotspot/opto/Block.java agent/src/share/classes/sun/jvm/hotspot/opto/Compile.java agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java agent/src/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java agent/src/share/classes/sun/jvm/hotspot/tools/JInfo.java agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java agent/src/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodDataAccessor.java make/Makefile make/aix/Makefile make/aix/adlc_updater make/aix/makefiles/adjust-mflags.sh make/aix/makefiles/adlc.make make/aix/makefiles/build_vm_def.sh make/aix/makefiles/buildtree.make make/aix/makefiles/compiler2.make make/aix/makefiles/core.make make/aix/makefiles/debug.make make/aix/makefiles/defs.make make/aix/makefiles/dtrace.make make/aix/makefiles/fastdebug.make make/aix/makefiles/jsig.make make/aix/makefiles/jvmti.make make/aix/makefiles/mapfile-vers-debug make/aix/makefiles/mapfile-vers-jsig make/aix/makefiles/mapfile-vers-product make/aix/makefiles/ppc64.make make/aix/makefiles/product.make make/aix/makefiles/rules.make make/aix/makefiles/sa.make make/aix/makefiles/saproc.make make/aix/makefiles/top.make make/aix/makefiles/trace.make make/aix/makefiles/vm.make make/aix/makefiles/xlc.make make/aix/platform_ppc64 make/bsd/makefiles/adjust-mflags.sh make/bsd/makefiles/adlc.make make/bsd/makefiles/debug.make make/bsd/makefiles/defs.make make/bsd/makefiles/dtrace.make make/bsd/makefiles/fastdebug.make make/bsd/makefiles/gcc.make make/bsd/makefiles/jsig.make make/bsd/makefiles/mapfile-vers-darwin-debug make/bsd/makefiles/mapfile-vers-darwin-product make/bsd/makefiles/mapfile-vers-debug make/bsd/makefiles/mapfile-vers-product make/bsd/makefiles/minimal1.make make/bsd/makefiles/optimized.make make/bsd/makefiles/product.make make/bsd/makefiles/saproc.make make/bsd/makefiles/top.make make/bsd/makefiles/vm.make make/defs.make make/excludeSrc.make make/hotspot.script make/linux/makefiles/adjust-mflags.sh make/linux/makefiles/adlc.make make/linux/makefiles/buildtree.make make/linux/makefiles/defs.make make/linux/makefiles/dtrace.make make/linux/makefiles/gcc.make make/linux/makefiles/jsig.make make/linux/makefiles/mapfile-vers-debug make/linux/makefiles/minimal1.make make/linux/makefiles/optimized.make make/linux/makefiles/ppc64.make make/linux/makefiles/product.make make/linux/makefiles/saproc.make make/linux/makefiles/top.make make/linux/makefiles/vm.make make/linux/platform_ppc make/linux/platform_ppc64 make/sa.files make/solaris/makefiles/adjust-mflags.sh make/solaris/makefiles/adlc.make make/solaris/makefiles/buildtree.make make/solaris/makefiles/dtrace.make make/solaris/makefiles/gcc.make make/solaris/makefiles/jsig.make make/solaris/makefiles/mapfile-vers-debug make/solaris/makefiles/optimized.make make/solaris/makefiles/product.make make/solaris/makefiles/saproc.make make/solaris/makefiles/top.make make/solaris/makefiles/vm.make make/windows/build_vm_def.sh make/windows/makefiles/adlc.make make/windows/makefiles/debug.make make/windows/makefiles/product.make make/windows/makefiles/projectcreator.make make/windows/makefiles/rules.make make/windows/makefiles/sa.make src/cpu/ppc/vm/assembler_ppc.cpp src/cpu/ppc/vm/assembler_ppc.hpp src/cpu/ppc/vm/assembler_ppc.inline.hpp src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp src/cpu/ppc/vm/bytecodes_ppc.cpp src/cpu/ppc/vm/bytecodes_ppc.hpp src/cpu/ppc/vm/bytes_ppc.hpp src/cpu/ppc/vm/c2_globals_ppc.hpp src/cpu/ppc/vm/c2_init_ppc.cpp src/cpu/ppc/vm/codeBuffer_ppc.hpp src/cpu/ppc/vm/compiledIC_ppc.cpp src/cpu/ppc/vm/copy_ppc.hpp src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp src/cpu/ppc/vm/cppInterpreter_ppc.cpp src/cpu/ppc/vm/cppInterpreter_ppc.hpp src/cpu/ppc/vm/debug_ppc.cpp src/cpu/ppc/vm/depChecker_ppc.hpp src/cpu/ppc/vm/disassembler_ppc.hpp src/cpu/ppc/vm/frame_ppc.cpp src/cpu/ppc/vm/frame_ppc.hpp src/cpu/ppc/vm/frame_ppc.inline.hpp src/cpu/ppc/vm/globalDefinitions_ppc.hpp src/cpu/ppc/vm/globals_ppc.hpp src/cpu/ppc/vm/icBuffer_ppc.cpp src/cpu/ppc/vm/icache_ppc.cpp src/cpu/ppc/vm/icache_ppc.hpp src/cpu/ppc/vm/interp_masm_ppc_64.cpp src/cpu/ppc/vm/interp_masm_ppc_64.hpp src/cpu/ppc/vm/interpreterGenerator_ppc.hpp src/cpu/ppc/vm/interpreterRT_ppc.cpp src/cpu/ppc/vm/interpreterRT_ppc.hpp src/cpu/ppc/vm/interpreter_ppc.cpp src/cpu/ppc/vm/interpreter_ppc.hpp src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp src/cpu/ppc/vm/jniFastGetField_ppc.cpp src/cpu/ppc/vm/jniTypes_ppc.hpp src/cpu/ppc/vm/jni_ppc.h src/cpu/ppc/vm/macroAssembler_ppc.cpp src/cpu/ppc/vm/macroAssembler_ppc.hpp src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp src/cpu/ppc/vm/metaspaceShared_ppc.cpp src/cpu/ppc/vm/methodHandles_ppc.cpp src/cpu/ppc/vm/methodHandles_ppc.hpp src/cpu/ppc/vm/nativeInst_ppc.cpp src/cpu/ppc/vm/nativeInst_ppc.hpp src/cpu/ppc/vm/ppc.ad src/cpu/ppc/vm/ppc_64.ad src/cpu/ppc/vm/registerMap_ppc.hpp src/cpu/ppc/vm/register_definitions_ppc.cpp src/cpu/ppc/vm/register_ppc.cpp src/cpu/ppc/vm/register_ppc.hpp src/cpu/ppc/vm/relocInfo_ppc.cpp src/cpu/ppc/vm/relocInfo_ppc.hpp src/cpu/ppc/vm/runtime_ppc.cpp src/cpu/ppc/vm/sharedRuntime_ppc.cpp src/cpu/ppc/vm/stubGenerator_ppc.cpp src/cpu/ppc/vm/stubRoutines_ppc_64.cpp src/cpu/ppc/vm/stubRoutines_ppc_64.hpp src/cpu/ppc/vm/vmStructs_ppc.hpp src/cpu/ppc/vm/vm_version_ppc.cpp src/cpu/ppc/vm/vm_version_ppc.hpp src/cpu/ppc/vm/vmreg_ppc.cpp src/cpu/ppc/vm/vmreg_ppc.hpp src/cpu/ppc/vm/vmreg_ppc.inline.hpp src/cpu/ppc/vm/vtableStubs_ppc_64.cpp src/cpu/sparc/vm/assembler_sparc.hpp src/cpu/sparc/vm/assembler_sparc.inline.hpp src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp src/cpu/sparc/vm/c1_FrameMap_sparc.cpp src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp src/cpu/sparc/vm/c1_Runtime1_sparc.cpp src/cpu/sparc/vm/c1_globals_sparc.hpp src/cpu/sparc/vm/c2_globals_sparc.hpp src/cpu/sparc/vm/c2_init_sparc.cpp src/cpu/sparc/vm/disassembler_sparc.hpp src/cpu/sparc/vm/frame_sparc.inline.hpp src/cpu/sparc/vm/globalDefinitions_sparc.hpp src/cpu/sparc/vm/globals_sparc.hpp src/cpu/sparc/vm/interp_masm_sparc.cpp src/cpu/sparc/vm/interp_masm_sparc.hpp src/cpu/sparc/vm/jni_sparc.h src/cpu/sparc/vm/nativeInst_sparc.hpp src/cpu/sparc/vm/register_sparc.hpp src/cpu/sparc/vm/sharedRuntime_sparc.cpp src/cpu/sparc/vm/sparc.ad src/cpu/sparc/vm/stubGenerator_sparc.cpp src/cpu/sparc/vm/stubRoutines_sparc.cpp src/cpu/sparc/vm/stubRoutines_sparc.hpp src/cpu/sparc/vm/templateInterpreter_sparc.cpp src/cpu/sparc/vm/templateTable_sparc.cpp src/cpu/sparc/vm/vmStructs_sparc.hpp src/cpu/sparc/vm/vm_version_sparc.cpp src/cpu/sparc/vm/vm_version_sparc.hpp src/cpu/x86/vm/bytecodeInterpreter_x86.cpp src/cpu/x86/vm/bytecodeInterpreter_x86.hpp src/cpu/x86/vm/c1_CodeStubs_x86.cpp src/cpu/x86/vm/c1_FrameMap_x86.cpp src/cpu/x86/vm/c1_FrameMap_x86.hpp src/cpu/x86/vm/c1_LIRAssembler_x86.cpp src/cpu/x86/vm/c1_LIRGenerator_x86.cpp src/cpu/x86/vm/c1_LinearScan_x86.cpp src/cpu/x86/vm/c1_MacroAssembler_x86.cpp src/cpu/x86/vm/c1_Runtime1_x86.cpp src/cpu/x86/vm/c1_globals_x86.hpp src/cpu/x86/vm/c2_globals_x86.hpp src/cpu/x86/vm/frame_x86.hpp src/cpu/x86/vm/frame_x86.inline.hpp src/cpu/x86/vm/globalDefinitions_x86.hpp src/cpu/x86/vm/globals_x86.hpp src/cpu/x86/vm/interp_masm_x86.cpp src/cpu/x86/vm/macroAssembler_x86.cpp src/cpu/x86/vm/macroAssembler_x86.hpp src/cpu/x86/vm/register_definitions_x86.cpp src/cpu/x86/vm/sharedRuntime_x86_32.cpp src/cpu/x86/vm/sharedRuntime_x86_64.cpp src/cpu/x86/vm/stubGenerator_x86_32.cpp src/cpu/x86/vm/stubGenerator_x86_64.cpp src/cpu/x86/vm/templateInterpreter_x86.hpp src/cpu/x86/vm/templateTable_x86_64.cpp src/cpu/x86/vm/vmStructs_x86.hpp src/cpu/x86/vm/vtableStubs_x86_32.cpp src/cpu/x86/vm/vtableStubs_x86_64.cpp src/cpu/x86/vm/x86.ad src/cpu/x86/vm/x86_32.ad src/cpu/x86/vm/x86_64.ad src/cpu/zero/vm/assembler_zero.cpp src/cpu/zero/vm/bytecodeInterpreter_zero.hpp src/cpu/zero/vm/cppInterpreter_zero.cpp src/cpu/zero/vm/entryFrame_zero.hpp src/cpu/zero/vm/frame_zero.cpp src/cpu/zero/vm/frame_zero.inline.hpp src/cpu/zero/vm/globalDefinitions_zero.hpp src/cpu/zero/vm/globals_zero.hpp src/cpu/zero/vm/icBuffer_zero.cpp src/cpu/zero/vm/interp_masm_zero.hpp src/cpu/zero/vm/interpreter_zero.cpp src/cpu/zero/vm/jni_zero.h src/cpu/zero/vm/nativeInst_zero.hpp src/cpu/zero/vm/register_zero.cpp src/cpu/zero/vm/relocInfo_zero.cpp src/cpu/zero/vm/sharedRuntime_zero.cpp src/cpu/zero/vm/sharkFrame_zero.hpp src/cpu/zero/vm/shark_globals_zero.hpp src/cpu/zero/vm/stubGenerator_zero.cpp src/cpu/zero/vm/vmStructs_zero.hpp src/cpu/zero/vm/vtableStubs_zero.cpp src/os/aix/vm/attachListener_aix.cpp src/os/aix/vm/c2_globals_aix.hpp src/os/aix/vm/decoder_aix.hpp src/os/aix/vm/globals_aix.hpp src/os/aix/vm/interfaceSupport_aix.hpp src/os/aix/vm/jsig.c src/os/aix/vm/jvm_aix.cpp src/os/aix/vm/jvm_aix.h src/os/aix/vm/libperfstat_aix.cpp src/os/aix/vm/libperfstat_aix.hpp src/os/aix/vm/loadlib_aix.cpp src/os/aix/vm/loadlib_aix.hpp src/os/aix/vm/mutex_aix.inline.hpp src/os/aix/vm/osThread_aix.cpp src/os/aix/vm/osThread_aix.hpp src/os/aix/vm/os_aix.cpp src/os/aix/vm/os_aix.hpp src/os/aix/vm/os_aix.inline.hpp src/os/aix/vm/os_share_aix.hpp src/os/aix/vm/perfMemory_aix.cpp src/os/aix/vm/porting_aix.cpp src/os/aix/vm/porting_aix.hpp src/os/aix/vm/threadCritical_aix.cpp src/os/aix/vm/thread_aix.inline.hpp src/os/aix/vm/vmError_aix.cpp src/os/bsd/dtrace/hotspot.d src/os/bsd/dtrace/hotspot_jni.d src/os/bsd/dtrace/hs_private.d src/os/bsd/dtrace/jvm_dtrace.c src/os/bsd/vm/os_bsd.cpp src/os/bsd/vm/os_bsd.hpp src/os/bsd/vm/os_bsd.inline.hpp src/os/linux/vm/decoder_linux.cpp src/os/linux/vm/os_linux.cpp src/os/linux/vm/os_linux.hpp src/os/linux/vm/os_linux.inline.hpp src/os/linux/vm/perfMemory_linux.cpp src/os/posix/dtrace/hotspot.d src/os/posix/dtrace/hotspot_jni.d src/os/posix/dtrace/hs_private.d src/os/posix/vm/os_posix.cpp src/os/posix/vm/os_posix.hpp src/os/solaris/dtrace/hotspot.d src/os/solaris/dtrace/hotspot_jni.d src/os/solaris/dtrace/hs_private.d src/os/solaris/dtrace/jvm_dtrace.c src/os/solaris/vm/globals_solaris.hpp src/os/solaris/vm/os_solaris.cpp src/os/solaris/vm/os_solaris.hpp src/os/solaris/vm/os_solaris.inline.hpp src/os/solaris/vm/perfMemory_solaris.cpp src/os/windows/vm/decoder_windows.hpp src/os/windows/vm/os_windows.cpp src/os/windows/vm/os_windows.hpp src/os/windows/vm/os_windows.inline.hpp src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.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/aix_ppc/vm/thread_aix_ppc.cpp src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp src/os_cpu/bsd_x86/vm/bsd_x86_32.s src/os_cpu/bsd_x86/vm/bsd_x86_64.s src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.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_ppc/vm/thread_linux_ppc.cpp src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp src/os_cpu/linux_sparc/vm/linux_sparc.s src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp src/os_cpu/linux_x86/vm/globals_linux_x86.hpp src/os_cpu/linux_x86/vm/linux_x86_32.s src/os_cpu/linux_x86/vm/linux_x86_64.s src/os_cpu/linux_x86/vm/os_linux_x86.cpp src/os_cpu/linux_x86/vm/os_linux_x86.hpp src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp src/os_cpu/linux_zero/vm/globals_linux_zero.hpp src/os_cpu/linux_zero/vm/os_linux_zero.cpp src/os_cpu/linux_zero/vm/os_linux_zero.hpp src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp src/os_cpu/solaris_sparc/vm/solaris_sparc.il src/os_cpu/solaris_sparc/vm/solaris_sparc.s src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp src/os_cpu/solaris_x86/vm/solaris_x86_32.s src/os_cpu/solaris_x86/vm/solaris_x86_64.s src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp src/os_cpu/windows_x86/vm/globals_windows_x86.hpp src/os_cpu/windows_x86/vm/os_windows_x86.cpp src/os_cpu/windows_x86/vm/os_windows_x86.hpp src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java src/share/tools/ProjectCreator/WinGammaPlatformVC10.java src/share/tools/ProjectCreator/WinGammaPlatformVC7.java src/share/tools/hsdis/Makefile src/share/tools/hsdis/README src/share/tools/hsdis/hsdis.c src/share/vm/adlc/adlc.hpp src/share/vm/adlc/adlparse.cpp src/share/vm/adlc/adlparse.hpp src/share/vm/adlc/archDesc.cpp src/share/vm/adlc/archDesc.hpp src/share/vm/adlc/dfa.cpp src/share/vm/adlc/dict2.cpp src/share/vm/adlc/formssel.cpp src/share/vm/adlc/formssel.hpp src/share/vm/adlc/main.cpp src/share/vm/adlc/output_c.cpp src/share/vm/adlc/output_h.cpp src/share/vm/asm/assembler.cpp src/share/vm/asm/assembler.hpp src/share/vm/asm/codeBuffer.cpp src/share/vm/asm/macroAssembler.hpp src/share/vm/asm/macroAssembler.inline.hpp src/share/vm/c1/c1_Canonicalizer.cpp src/share/vm/c1/c1_Canonicalizer.hpp src/share/vm/c1/c1_CodeStubs.hpp src/share/vm/c1/c1_Compilation.cpp src/share/vm/c1/c1_Compilation.hpp src/share/vm/c1/c1_Compiler.cpp src/share/vm/c1/c1_Compiler.hpp src/share/vm/c1/c1_FrameMap.cpp src/share/vm/c1/c1_FrameMap.hpp src/share/vm/c1/c1_GraphBuilder.cpp src/share/vm/c1/c1_GraphBuilder.hpp src/share/vm/c1/c1_IR.cpp src/share/vm/c1/c1_IR.hpp src/share/vm/c1/c1_Instruction.cpp src/share/vm/c1/c1_InstructionPrinter.hpp src/share/vm/c1/c1_LIRAssembler.cpp src/share/vm/c1/c1_LIRGenerator.cpp src/share/vm/c1/c1_LinearScan.cpp src/share/vm/c1/c1_Optimizer.cpp src/share/vm/c1/c1_RangeCheckElimination.cpp src/share/vm/c1/c1_RangeCheckElimination.hpp src/share/vm/c1/c1_Runtime1.hpp src/share/vm/c1/c1_ValueMap.cpp src/share/vm/c1/c1_ValueMap.hpp src/share/vm/c1/c1_ValueStack.cpp src/share/vm/c1/c1_ValueStack.hpp src/share/vm/c1/c1_globals.cpp src/share/vm/c1/c1_globals.hpp src/share/vm/ci/bcEscapeAnalyzer.cpp src/share/vm/ci/bcEscapeAnalyzer.hpp src/share/vm/ci/ciArray.cpp src/share/vm/ci/ciArray.hpp src/share/vm/ci/ciClassList.hpp src/share/vm/ci/ciConstant.hpp src/share/vm/ci/ciEnv.cpp src/share/vm/ci/ciEnv.hpp src/share/vm/ci/ciField.cpp src/share/vm/ci/ciField.hpp src/share/vm/ci/ciFlags.hpp src/share/vm/ci/ciInstance.cpp src/share/vm/ci/ciInstanceKlass.hpp src/share/vm/ci/ciKlass.cpp src/share/vm/ci/ciKlass.hpp src/share/vm/ci/ciMethod.cpp src/share/vm/ci/ciMethod.hpp src/share/vm/ci/ciMethodData.cpp src/share/vm/ci/ciMethodData.hpp src/share/vm/ci/ciObjArrayKlass.cpp src/share/vm/ci/ciObjArrayKlass.hpp src/share/vm/ci/ciObjectFactory.cpp src/share/vm/ci/ciObjectFactory.hpp src/share/vm/ci/ciReplay.cpp src/share/vm/ci/ciReplay.hpp src/share/vm/ci/ciStreams.hpp src/share/vm/ci/ciType.cpp src/share/vm/ci/ciType.hpp src/share/vm/ci/ciTypeArray.cpp src/share/vm/ci/ciTypeArrayKlass.hpp src/share/vm/ci/ciTypeFlow.cpp src/share/vm/ci/ciUtilities.hpp src/share/vm/classfile/altHashing.cpp src/share/vm/classfile/altHashing.hpp src/share/vm/classfile/bytecodeAssembler.cpp src/share/vm/classfile/classFileParser.cpp src/share/vm/classfile/classFileStream.cpp src/share/vm/classfile/classFileStream.hpp src/share/vm/classfile/classLoader.cpp src/share/vm/classfile/classLoaderData.cpp src/share/vm/classfile/classLoaderData.hpp src/share/vm/classfile/classLoaderData.inline.hpp src/share/vm/classfile/defaultMethods.cpp src/share/vm/classfile/dictionary.cpp src/share/vm/classfile/javaClasses.cpp src/share/vm/classfile/javaClasses.hpp src/share/vm/classfile/symbolTable.cpp src/share/vm/classfile/symbolTable.hpp src/share/vm/classfile/systemDictionary.cpp src/share/vm/classfile/systemDictionary.hpp src/share/vm/classfile/vmSymbols.cpp src/share/vm/classfile/vmSymbols.hpp src/share/vm/code/codeCache.cpp src/share/vm/code/compiledIC.hpp src/share/vm/code/compressedStream.cpp src/share/vm/code/debugInfo.hpp src/share/vm/code/dependencies.cpp src/share/vm/code/dependencies.hpp src/share/vm/code/icBuffer.hpp src/share/vm/code/nmethod.cpp src/share/vm/code/nmethod.hpp src/share/vm/code/relocInfo.cpp src/share/vm/code/relocInfo.hpp src/share/vm/code/scopeDesc.hpp src/share/vm/code/stubs.cpp src/share/vm/code/stubs.hpp src/share/vm/code/vmreg.hpp src/share/vm/code/vtableStubs.cpp src/share/vm/code/vtableStubs.hpp src/share/vm/compiler/abstractCompiler.cpp src/share/vm/compiler/abstractCompiler.hpp src/share/vm/compiler/compileBroker.cpp src/share/vm/compiler/compileBroker.hpp src/share/vm/compiler/compileLog.cpp src/share/vm/compiler/compileLog.hpp src/share/vm/compiler/compilerOracle.cpp src/share/vm/compiler/disassembler.cpp src/share/vm/compiler/disassembler.hpp src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp src/share/vm/gc_implementation/g1/bufferingOopClosure.cpp src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp src/share/vm/gc_implementation/g1/collectionSetChooser.cpp src/share/vm/gc_implementation/g1/collectionSetChooser.hpp src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp src/share/vm/gc_implementation/g1/concurrentMark.cpp src/share/vm/gc_implementation/g1/concurrentMark.hpp src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp src/share/vm/gc_implementation/g1/g1AllocRegion.hpp src/share/vm/gc_implementation/g1/g1AllocRegion.inline.hpp src/share/vm/gc_implementation/g1/g1BiasedArray.hpp src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp src/share/vm/gc_implementation/g1/g1CardCounts.cpp src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp src/share/vm/gc_implementation/g1/g1EvacFailure.hpp src/share/vm/gc_implementation/g1/g1MMUTracker.hpp src/share/vm/gc_implementation/g1/g1MarkSweep.cpp src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp src/share/vm/gc_implementation/g1/g1OopClosures.cpp src/share/vm/gc_implementation/g1/g1OopClosures.hpp src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp src/share/vm/gc_implementation/g1/g1RemSet.cpp src/share/vm/gc_implementation/g1/g1RemSet.hpp src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp src/share/vm/gc_implementation/g1/g1_globals.hpp src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp src/share/vm/gc_implementation/g1/heapRegion.cpp src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp src/share/vm/gc_implementation/g1/heapRegionSeq.cpp src/share/vm/gc_implementation/g1/heapRegionSeq.hpp src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp src/share/vm/gc_implementation/g1/ptrQueue.cpp src/share/vm/gc_implementation/g1/ptrQueue.hpp src/share/vm/gc_implementation/g1/satbQueue.cpp src/share/vm/gc_implementation/g1/satbQueue.hpp src/share/vm/gc_implementation/g1/sparsePRT.cpp src/share/vm/gc_implementation/g1/sparsePRT.hpp src/share/vm/gc_implementation/g1/vmStructs_g1.hpp src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp src/share/vm/gc_implementation/parNew/parNewGeneration.cpp src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp src/share/vm/gc_implementation/shared/allocationStats.cpp src/share/vm/gc_implementation/shared/allocationStats.hpp src/share/vm/gc_implementation/shared/concurrentGCThread.cpp src/share/vm/gc_implementation/shared/concurrentGCThread.hpp src/share/vm/gc_implementation/shared/gSpaceCounters.cpp src/share/vm/gc_implementation/shared/gSpaceCounters.hpp src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp src/share/vm/gc_implementation/shared/gcUtil.cpp src/share/vm/gc_implementation/shared/gcUtil.hpp src/share/vm/gc_implementation/shared/immutableSpace.cpp src/share/vm/gc_implementation/shared/isGCActiveMark.hpp src/share/vm/gc_implementation/shared/markSweep.cpp src/share/vm/gc_implementation/shared/markSweep.hpp src/share/vm/gc_implementation/shared/markSweep.inline.hpp src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp src/share/vm/gc_implementation/shared/mutableSpace.cpp src/share/vm/gc_implementation/shared/mutableSpace.hpp src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp src/share/vm/gc_implementation/shared/spaceCounters.cpp src/share/vm/gc_implementation/shared/spaceCounters.hpp src/share/vm/gc_implementation/shared/spaceDecorator.hpp src/share/vm/gc_implementation/shared/vmGCOperations.cpp src/share/vm/gc_interface/collectedHeap.cpp src/share/vm/gc_interface/collectedHeap.hpp src/share/vm/gc_interface/collectedHeap.inline.hpp src/share/vm/gc_interface/gcCause.cpp src/share/vm/gc_interface/gcCause.hpp src/share/vm/interpreter/abstractInterpreter.hpp src/share/vm/interpreter/bytecodeInterpreter.cpp src/share/vm/interpreter/bytecodeInterpreter.hpp src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp src/share/vm/interpreter/bytecodeTracer.cpp src/share/vm/interpreter/cppInterpreter.hpp src/share/vm/interpreter/interpreter.hpp src/share/vm/interpreter/interpreterRuntime.cpp src/share/vm/interpreter/interpreterRuntime.hpp src/share/vm/interpreter/invocationCounter.hpp src/share/vm/interpreter/linkResolver.cpp src/share/vm/interpreter/rewriter.cpp src/share/vm/interpreter/rewriter.hpp src/share/vm/interpreter/templateInterpreter.hpp src/share/vm/interpreter/templateInterpreterGenerator.hpp src/share/vm/interpreter/templateTable.hpp src/share/vm/libadt/port.hpp src/share/vm/memory/allocation.cpp src/share/vm/memory/allocation.hpp src/share/vm/memory/barrierSet.hpp src/share/vm/memory/barrierSet.inline.hpp src/share/vm/memory/binaryTreeDictionary.cpp src/share/vm/memory/binaryTreeDictionary.hpp src/share/vm/memory/blockOffsetTable.cpp src/share/vm/memory/blockOffsetTable.hpp src/share/vm/memory/cardTableModRefBS.cpp src/share/vm/memory/cardTableModRefBS.hpp src/share/vm/memory/cardTableRS.cpp src/share/vm/memory/cardTableRS.hpp src/share/vm/memory/collectorPolicy.cpp src/share/vm/memory/collectorPolicy.hpp src/share/vm/memory/defNewGeneration.cpp src/share/vm/memory/defNewGeneration.hpp src/share/vm/memory/freeBlockDictionary.cpp src/share/vm/memory/freeList.cpp src/share/vm/memory/freeList.hpp src/share/vm/memory/gcLocker.cpp src/share/vm/memory/gcLocker.hpp src/share/vm/memory/genCollectedHeap.cpp src/share/vm/memory/genCollectedHeap.hpp src/share/vm/memory/genMarkSweep.cpp src/share/vm/memory/genOopClosures.inline.hpp src/share/vm/memory/genRemSet.cpp src/share/vm/memory/genRemSet.hpp src/share/vm/memory/generation.hpp src/share/vm/memory/generationSpec.cpp src/share/vm/memory/heap.cpp src/share/vm/memory/heap.hpp src/share/vm/memory/heapInspection.hpp src/share/vm/memory/iterator.cpp src/share/vm/memory/iterator.hpp src/share/vm/memory/metachunk.hpp src/share/vm/memory/metaspace.cpp src/share/vm/memory/metaspace.hpp src/share/vm/memory/metaspaceCounters.cpp src/share/vm/memory/metaspaceCounters.hpp src/share/vm/memory/metaspaceShared.cpp src/share/vm/memory/modRefBarrierSet.hpp src/share/vm/memory/referenceProcessor.cpp src/share/vm/memory/referenceProcessor.hpp src/share/vm/memory/resourceArea.hpp src/share/vm/memory/sharedHeap.cpp src/share/vm/memory/sharedHeap.hpp src/share/vm/memory/space.cpp src/share/vm/memory/space.hpp src/share/vm/memory/specialized_oop_closures.hpp src/share/vm/memory/tenuredGeneration.cpp src/share/vm/memory/tenuredGeneration.hpp src/share/vm/memory/threadLocalAllocBuffer.cpp src/share/vm/memory/threadLocalAllocBuffer.hpp src/share/vm/memory/universe.cpp src/share/vm/oops/arrayKlass.cpp src/share/vm/oops/arrayKlass.hpp src/share/vm/oops/arrayOop.hpp src/share/vm/oops/compiledICHolder.cpp src/share/vm/oops/constantPool.cpp src/share/vm/oops/cpCache.cpp src/share/vm/oops/cpCache.hpp src/share/vm/oops/fieldInfo.hpp src/share/vm/oops/generateOopMap.cpp src/share/vm/oops/instanceClassLoaderKlass.cpp src/share/vm/oops/instanceClassLoaderKlass.hpp src/share/vm/oops/instanceKlass.cpp src/share/vm/oops/instanceKlass.hpp src/share/vm/oops/instanceMirrorKlass.cpp src/share/vm/oops/instanceOop.hpp src/share/vm/oops/instanceRefKlass.hpp src/share/vm/oops/klass.cpp src/share/vm/oops/klass.hpp src/share/vm/oops/klassPS.hpp src/share/vm/oops/klassVtable.cpp src/share/vm/oops/metadata.hpp src/share/vm/oops/method.hpp src/share/vm/oops/methodData.cpp src/share/vm/oops/methodData.hpp src/share/vm/oops/objArrayKlass.cpp src/share/vm/oops/objArrayKlass.hpp src/share/vm/oops/objArrayKlass.inline.hpp src/share/vm/oops/oop.cpp src/share/vm/oops/oop.hpp src/share/vm/oops/oop.inline.hpp src/share/vm/oops/oop.pcgc.inline.hpp src/share/vm/oops/oop.psgc.inline.hpp src/share/vm/oops/symbol.cpp src/share/vm/oops/symbol.hpp src/share/vm/oops/typeArrayKlass.cpp src/share/vm/oops/typeArrayKlass.hpp src/share/vm/oops/typeArrayOop.hpp src/share/vm/opto/block.cpp src/share/vm/opto/block.hpp src/share/vm/opto/buildOopMap.cpp src/share/vm/opto/bytecodeInfo.cpp src/share/vm/opto/c2_globals.hpp src/share/vm/opto/c2compiler.cpp src/share/vm/opto/c2compiler.hpp src/share/vm/opto/callGenerator.cpp src/share/vm/opto/callnode.cpp src/share/vm/opto/callnode.hpp src/share/vm/opto/cfgnode.cpp src/share/vm/opto/chaitin.cpp src/share/vm/opto/chaitin.hpp src/share/vm/opto/classes.cpp src/share/vm/opto/classes.hpp src/share/vm/opto/coalesce.cpp src/share/vm/opto/coalesce.hpp src/share/vm/opto/compile.cpp src/share/vm/opto/compile.hpp src/share/vm/opto/connode.cpp src/share/vm/opto/connode.hpp src/share/vm/opto/doCall.cpp src/share/vm/opto/domgraph.cpp src/share/vm/opto/escape.cpp src/share/vm/opto/gcm.cpp src/share/vm/opto/generateOptoStub.cpp src/share/vm/opto/graphKit.cpp src/share/vm/opto/graphKit.hpp src/share/vm/opto/idealGraphPrinter.cpp src/share/vm/opto/idealKit.cpp src/share/vm/opto/idealKit.hpp src/share/vm/opto/ifg.cpp src/share/vm/opto/ifnode.cpp src/share/vm/opto/lcm.cpp src/share/vm/opto/library_call.cpp src/share/vm/opto/live.cpp src/share/vm/opto/live.hpp src/share/vm/opto/locknode.hpp src/share/vm/opto/loopPredicate.cpp src/share/vm/opto/loopTransform.cpp src/share/vm/opto/loopnode.hpp src/share/vm/opto/loopopts.cpp src/share/vm/opto/machnode.cpp src/share/vm/opto/machnode.hpp src/share/vm/opto/macro.cpp src/share/vm/opto/macro.hpp src/share/vm/opto/matcher.cpp src/share/vm/opto/matcher.hpp src/share/vm/opto/mathexactnode.cpp src/share/vm/opto/mathexactnode.hpp src/share/vm/opto/memnode.cpp src/share/vm/opto/memnode.hpp src/share/vm/opto/mulnode.cpp src/share/vm/opto/multnode.cpp src/share/vm/opto/multnode.hpp src/share/vm/opto/node.cpp src/share/vm/opto/node.hpp src/share/vm/opto/optoreg.hpp src/share/vm/opto/output.cpp src/share/vm/opto/output.hpp src/share/vm/opto/parse.hpp src/share/vm/opto/parse1.cpp src/share/vm/opto/parse2.cpp src/share/vm/opto/parse3.cpp src/share/vm/opto/parseHelper.cpp src/share/vm/opto/phase.cpp src/share/vm/opto/phase.hpp src/share/vm/opto/phaseX.cpp src/share/vm/opto/phaseX.hpp src/share/vm/opto/postaloc.cpp src/share/vm/opto/reg_split.cpp src/share/vm/opto/regalloc.cpp src/share/vm/opto/regalloc.hpp src/share/vm/opto/regmask.cpp src/share/vm/opto/regmask.hpp src/share/vm/opto/runtime.cpp src/share/vm/opto/stringopts.cpp src/share/vm/opto/subnode.cpp src/share/vm/opto/subnode.hpp src/share/vm/opto/superword.cpp src/share/vm/opto/superword.hpp src/share/vm/opto/type.cpp src/share/vm/opto/type.hpp src/share/vm/opto/vectornode.hpp src/share/vm/precompiled/precompiled.hpp src/share/vm/prims/forte.cpp src/share/vm/prims/jni.cpp src/share/vm/prims/jniCheck.cpp src/share/vm/prims/jvm.cpp src/share/vm/prims/jvm.h src/share/vm/prims/jvm_misc.hpp src/share/vm/prims/jvmtiClassFileReconstituter.cpp src/share/vm/prims/jvmtiClassFileReconstituter.hpp src/share/vm/prims/jvmtiCodeBlobEvents.cpp src/share/vm/prims/jvmtiEnter.xsl src/share/vm/prims/jvmtiEnv.cpp src/share/vm/prims/jvmtiEnvBase.hpp src/share/vm/prims/jvmtiEnvThreadState.cpp src/share/vm/prims/jvmtiEventController.cpp src/share/vm/prims/jvmtiExport.cpp src/share/vm/prims/jvmtiExport.hpp src/share/vm/prims/jvmtiGetLoadedClasses.cpp src/share/vm/prims/jvmtiManageCapabilities.cpp src/share/vm/prims/jvmtiTagMap.cpp src/share/vm/prims/jvmtiTrace.hpp src/share/vm/prims/methodHandles.cpp src/share/vm/prims/methodHandles.hpp src/share/vm/prims/nativeLookup.cpp src/share/vm/prims/perf.cpp src/share/vm/prims/unsafe.cpp src/share/vm/prims/wbtestmethods/parserTests.hpp src/share/vm/prims/whitebox.cpp src/share/vm/prims/whitebox.hpp src/share/vm/runtime/advancedThresholdPolicy.cpp src/share/vm/runtime/advancedThresholdPolicy.hpp src/share/vm/runtime/arguments.cpp src/share/vm/runtime/arguments.hpp src/share/vm/runtime/atomic.cpp src/share/vm/runtime/atomic.hpp src/share/vm/runtime/atomic.inline.hpp src/share/vm/runtime/biasedLocking.cpp src/share/vm/runtime/compilationPolicy.cpp src/share/vm/runtime/compilationPolicy.hpp src/share/vm/runtime/deoptimization.cpp src/share/vm/runtime/deoptimization.hpp src/share/vm/runtime/fprofiler.hpp src/share/vm/runtime/frame.cpp src/share/vm/runtime/frame.hpp src/share/vm/runtime/frame.inline.hpp src/share/vm/runtime/globals.cpp src/share/vm/runtime/globals.hpp src/share/vm/runtime/globals_extension.hpp src/share/vm/runtime/handles.hpp src/share/vm/runtime/handles.inline.hpp src/share/vm/runtime/interfaceSupport.hpp src/share/vm/runtime/java.cpp src/share/vm/runtime/javaCalls.cpp src/share/vm/runtime/javaCalls.hpp src/share/vm/runtime/javaFrameAnchor.hpp src/share/vm/runtime/jniHandles.cpp src/share/vm/runtime/jniHandles.hpp src/share/vm/runtime/mutex.cpp src/share/vm/runtime/mutex.hpp src/share/vm/runtime/mutexLocker.hpp src/share/vm/runtime/objectMonitor.cpp src/share/vm/runtime/objectMonitor.hpp src/share/vm/runtime/orderAccess.hpp src/share/vm/runtime/os.cpp src/share/vm/runtime/os.hpp src/share/vm/runtime/osThread.hpp src/share/vm/runtime/park.cpp src/share/vm/runtime/perfData.cpp src/share/vm/runtime/perfData.hpp src/share/vm/runtime/perfMemory.cpp src/share/vm/runtime/perfMemory.hpp src/share/vm/runtime/reflection.cpp src/share/vm/runtime/reflection.hpp src/share/vm/runtime/registerMap.hpp src/share/vm/runtime/relocator.cpp src/share/vm/runtime/safepoint.cpp src/share/vm/runtime/safepoint.hpp src/share/vm/runtime/serviceThread.cpp src/share/vm/runtime/sharedRuntime.cpp src/share/vm/runtime/sharedRuntime.hpp src/share/vm/runtime/sharedRuntimeTrans.cpp src/share/vm/runtime/sharedRuntimeTrig.cpp src/share/vm/runtime/signature.cpp src/share/vm/runtime/signature.hpp src/share/vm/runtime/simpleThresholdPolicy.cpp src/share/vm/runtime/statSampler.cpp src/share/vm/runtime/stubCodeGenerator.cpp src/share/vm/runtime/stubCodeGenerator.hpp src/share/vm/runtime/stubRoutines.hpp src/share/vm/runtime/sweeper.cpp src/share/vm/runtime/sweeper.hpp src/share/vm/runtime/synchronizer.cpp src/share/vm/runtime/synchronizer.hpp src/share/vm/runtime/thread.cpp src/share/vm/runtime/thread.hpp src/share/vm/runtime/thread.inline.hpp src/share/vm/runtime/threadLocalStorage.hpp src/share/vm/runtime/timer.cpp src/share/vm/runtime/unhandledOops.hpp src/share/vm/runtime/vframe.cpp src/share/vm/runtime/vframe.hpp src/share/vm/runtime/vframeArray.hpp src/share/vm/runtime/virtualspace.cpp src/share/vm/runtime/virtualspace.hpp src/share/vm/runtime/vmStructs.cpp src/share/vm/runtime/vmThread.cpp src/share/vm/runtime/vmThread.hpp src/share/vm/runtime/vm_operations.hpp src/share/vm/runtime/vm_version.cpp src/share/vm/runtime/vm_version.hpp src/share/vm/services/attachListener.cpp src/share/vm/services/attachListener.hpp src/share/vm/services/classLoadingService.cpp src/share/vm/services/classLoadingService.hpp src/share/vm/services/diagnosticCommand.cpp src/share/vm/services/diagnosticCommand.hpp src/share/vm/services/dtraceAttacher.cpp src/share/vm/services/g1MemoryPool.hpp src/share/vm/services/heapDumper.cpp src/share/vm/services/jmm.h src/share/vm/services/management.cpp src/share/vm/services/memReporter.cpp src/share/vm/services/memReporter.hpp src/share/vm/services/memSnapshot.hpp src/share/vm/services/memoryManager.cpp src/share/vm/services/memoryManager.hpp src/share/vm/services/memoryPool.hpp src/share/vm/services/memoryService.cpp src/share/vm/services/memoryService.hpp src/share/vm/services/memoryUsage.hpp src/share/vm/services/psMemoryPool.hpp src/share/vm/services/runtimeService.cpp src/share/vm/services/threadService.hpp src/share/vm/shark/sharkBlock.cpp src/share/vm/shark/sharkBuilder.cpp src/share/vm/shark/sharkCompiler.cpp src/share/vm/shark/sharkCompiler.hpp src/share/vm/shark/sharkConstant.cpp src/share/vm/shark/sharkFunction.cpp src/share/vm/shark/sharkInliner.cpp src/share/vm/shark/sharkInvariants.hpp src/share/vm/shark/sharkTopLevelBlock.cpp src/share/vm/trace/trace.xml src/share/vm/trace/tracetypes.xml src/share/vm/utilities/accessFlags.cpp src/share/vm/utilities/array.hpp src/share/vm/utilities/bitMap.cpp src/share/vm/utilities/bitMap.hpp src/share/vm/utilities/bitMap.inline.hpp src/share/vm/utilities/debug.hpp src/share/vm/utilities/decoder.cpp src/share/vm/utilities/decoder.hpp src/share/vm/utilities/decoder_elf.cpp src/share/vm/utilities/decoder_elf.hpp src/share/vm/utilities/dtrace.hpp src/share/vm/utilities/dtrace_disabled.hpp src/share/vm/utilities/dtrace_usdt2_disabled.hpp src/share/vm/utilities/elfFile.cpp src/share/vm/utilities/elfFile.hpp src/share/vm/utilities/elfFuncDescTable.cpp src/share/vm/utilities/elfFuncDescTable.hpp src/share/vm/utilities/elfStringTable.cpp src/share/vm/utilities/elfStringTable.hpp src/share/vm/utilities/elfSymbolTable.cpp src/share/vm/utilities/elfSymbolTable.hpp src/share/vm/utilities/exceptions.cpp src/share/vm/utilities/exceptions.hpp src/share/vm/utilities/globalDefinitions.cpp src/share/vm/utilities/globalDefinitions.hpp src/share/vm/utilities/globalDefinitions_visCPP.hpp src/share/vm/utilities/globalDefinitions_xlc.hpp src/share/vm/utilities/growableArray.hpp src/share/vm/utilities/hashtable.cpp src/share/vm/utilities/hashtable.hpp src/share/vm/utilities/histogram.hpp src/share/vm/utilities/macros.hpp src/share/vm/utilities/numberSeq.cpp src/share/vm/utilities/ostream.cpp src/share/vm/utilities/ostream.hpp src/share/vm/utilities/resourceHash.hpp src/share/vm/utilities/taskqueue.hpp src/share/vm/utilities/top.hpp src/share/vm/utilities/vmError.cpp src/share/vm/utilities/yieldingWorkgroup.cpp test/Makefile test/TEST.ROOT test/TEST.groups test/compiler/5091921/Test7005594.sh test/compiler/6431242/Test.java test/compiler/6589834/Test_ia32.java test/compiler/6636138/Test1.java test/compiler/6636138/Test2.java test/compiler/6795161/Test.java test/compiler/6826736/Test.java test/compiler/6857159/Test6857159.sh test/compiler/7068051/Test7068051.sh test/compiler/7070134/Test7070134.sh test/compiler/7184394/TestAESMain.java test/compiler/7200264/Test7200264.sh test/compiler/8000805/Test8000805.java test/compiler/8005419/Test8005419.java test/compiler/ciReplay/common.sh test/compiler/codegen/LoadWithMask.java test/compiler/codegen/LoadWithMask2.java test/compiler/debug/VerifyAdapterSharing.java test/compiler/inlining/DefaultAndConcreteMethodsCHA.java test/compiler/intrinsics/mathexact/AddExactICondTest.java test/compiler/intrinsics/mathexact/AddExactIConstantTest.java test/compiler/intrinsics/mathexact/AddExactILoadTest.java test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java test/compiler/intrinsics/mathexact/AddExactLConstantTest.java test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java test/compiler/intrinsics/mathexact/CompareTest.java test/compiler/intrinsics/mathexact/DecExactITest.java test/compiler/intrinsics/mathexact/DecExactLTest.java test/compiler/intrinsics/mathexact/GVNTest.java test/compiler/intrinsics/mathexact/IncExactITest.java test/compiler/intrinsics/mathexact/IncExactLTest.java test/compiler/intrinsics/mathexact/MulExactICondTest.java test/compiler/intrinsics/mathexact/MulExactIConstantTest.java test/compiler/intrinsics/mathexact/MulExactILoadTest.java test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java test/compiler/intrinsics/mathexact/MulExactLConstantTest.java test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java test/compiler/intrinsics/mathexact/NegExactIConstantTest.java test/compiler/intrinsics/mathexact/NegExactILoadTest.java test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java test/compiler/intrinsics/mathexact/NegExactLConstantTest.java test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java test/compiler/intrinsics/mathexact/NestedMathExactTest.java test/compiler/intrinsics/mathexact/SplitThruPhiTest.java test/compiler/intrinsics/mathexact/SubExactICondTest.java test/compiler/intrinsics/mathexact/SubExactIConstantTest.java test/compiler/intrinsics/mathexact/SubExactILoadTest.java test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java test/compiler/intrinsics/mathexact/SubExactLConstantTest.java test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java test/compiler/intrinsics/mathexact/Verify.java test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java test/compiler/intrinsics/mathexact/sanity/MathIntrinsic.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java test/compiler/intrinsics/mathexact/sanity/Verifier.java test/compiler/jsr292/ConcurrentClassLoadingTest.java test/compiler/startup/NumCompilerThreadsCheck.java test/compiler/startup/SmallCodeCacheStartup.java test/compiler/startup/StartupOutput.java test/compiler/tiered/NonTieredLevelsTest.java test/compiler/tiered/TieredLevelsTest.java test/compiler/types/TestMeetTopArrayExactConstantArray.java test/compiler/types/TestSpeculationFailedHigherEqual.java test/compiler/types/TypeSpeculation.java test/compiler/uncommontrap/StackOverflowGuardPagesOff.java test/compiler/uncommontrap/TestLockEliminatedAtDeopt.java test/compiler/uncommontrap/TestSpecTrapClassUnloading.java test/compiler/whitebox/ClearMethodStateTest.java test/compiler/whitebox/CompilerWhiteBoxTest.java test/compiler/whitebox/DeoptimizeAllTest.java test/compiler/whitebox/DeoptimizeMethodTest.java test/compiler/whitebox/EnqueueMethodForCompilationTest.java test/compiler/whitebox/IsMethodCompilableTest.java test/compiler/whitebox/MakeMethodNotCompilableTest.java test/compiler/whitebox/SetDontInlineMethodTest.java test/compiler/whitebox/SetForceInlineMethodTest.java test/gc/6941923/Test6941923.java test/gc/TestVerifySilently.java test/gc/arguments/TestMaxHeapSizeTools.java test/gc/defnew/HeapChangeLogging.java test/gc/g1/Test2GbHeap.java test/gc/g1/TestHumongousAllocInitialMark.java test/gc/g1/TestStringSymbolTableStats.java test/runtime/6626217/Test6626217.sh test/runtime/6925573/SortMethodsTest.java test/runtime/6929067/Test6929067.sh test/runtime/7107135/Test7107135.sh test/runtime/7110720/Test7110720.sh test/runtime/7158988/FieldMonitor.java test/runtime/7162488/Test7162488.sh test/runtime/ClassFile/UnsupportedClassFileVersion.java test/runtime/CommandLine/CompilerConfigFileWarning.java test/runtime/CommandLine/ConfigFileWarning.java test/runtime/CommandLine/VMOptionWarning.java test/runtime/CompressedOops/CompressedClassPointers.java test/runtime/LoadClass/LoadClassNegative.java test/runtime/NMT/CommandLineDetail.java test/runtime/NMT/CommandLineSummary.java test/runtime/NMT/CommandLineTurnOffNMT.java test/runtime/NMT/PrintNMTStatistics.java test/runtime/PerfMemDestroy/PerfMemDestroy.java test/runtime/RedefineObject/Agent.java test/runtime/RedefineObject/TestRedefineObject.java test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java test/runtime/SharedArchiveFile/CdsWriteError.java test/runtime/SharedArchiveFile/DefaultUseWithClient.java test/runtime/XCheckJniJsig/XCheckJSig.java test/runtime/finalStatic/FinalStatic.java test/runtime/jsig/Test8017498.sh test/runtime/lambda-features/InvokespecialInterface.java test/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java test/runtime/memory/ReadFromNoaccessArea.java test/serviceability/dcmd/DcmdUtil.java test/serviceability/dcmd/DynLibDcmdTest.java test/serviceability/sa/jmap-hashcode/Test8028623.java test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java
diffstat 1208 files changed, 14739 insertions(+), 76289 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 01 14:09:03 2014 +0200
+++ b/.hgtags	Tue Apr 01 13:57:07 2014 +0200
@@ -404,8 +404,4 @@
 fca262db9c4309f99d2f5542ab0780e45c2f1578 jdk8-b120
 41f4cad94c581034d4c427d2aaabcc20f26342d0 hs25-b63
 b124e22eb772806c13d942cc110de38da0108147 graal-0.1
-ce2d7e46f3c7e41241f3b407705a4071323a11ab jdk9-b00
-050a626a88951140df874f7b163e304d07b6c296 jdk9-b01
-b188446de75bda5fc52d102cddf242c3ef5ecbdf jdk9-b02
-b2fee789d23f3cdabb3db4e51af43038e5692d3a jdk9-b03
 483d05bf77a7c2a762aca1e06c4191bc06647176 graal-0.2
--- a/THIRD_PARTY_README	Tue Apr 01 14:09:03 2014 +0200
+++ b/THIRD_PARTY_README	Tue Apr 01 13:57:07 2014 +0200
@@ -2,12 +2,11 @@
 -----------------------------
 
 %% This notice is provided with respect to ASM Bytecode Manipulation 
-Framework v5.0, which may be included with JRE 8, and JDK 8, and 
-OpenJDK 8.
+Framework v3.1, which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
-Copyright (c) 2000-2011 France Télécom
+Copyright (c) 2000-2005 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -41,41 +40,8 @@
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to BSDiff v4.3, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright 2003-2005 Colin Percival
-All rights reserved
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted providing that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to CodeViewer 1.0, which may be
-included with JDK 8.
+%% This notice is provided with respect to CodeViewer 1.0, which is included 
+with JDK 7.
 
 --- begin of LICENSE ---
 
@@ -115,8 +81,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Cryptix AES 3.2.0, which may be
-included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to Cryptix AES 3.2.0, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -155,7 +121,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to CUP Parser Generator for 
-Java 0.10k, which may be included with JRE 8, JDK 8, and OpenJDK 8.
+Java 0.10k, which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -182,7 +148,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to Document Object Model (DOM) Level 2
-& 3, which may be included with JRE 8, JDK 8, and OpenJDK 8.
+& 3, which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -246,52 +212,19 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Dynalink v0.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2009-2013, Attila Szegedi
-
-All rights reserved.Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following conditions are
-met:* Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.  * Redistributions in
-binary form must reproduce the above copyright notice,   this list of
-conditions and the following disclaimer in the documentation  and/or other
-materials provided with the distribution.  * Neither the name of Attila
-Szegedi nor the names of its contributors may be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF SUCH DAMAGE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to Elliptic Curve Cryptography, which 
-may be included with JRE 8, JDK 8, and OpenJDK 8.
+is included with JRE 7, JDK 7, and OpenJDK 7.
 
 You are receiving a copy of the Elliptic Curve Cryptography library in source
-form with the JDK 8 and OpenJDK 8 source distributions, and as object code in
-the JRE 8 & JDK 8 runtimes.
-
-In the case of the JRE 8 & JDK 8 runtimes, the terms of the Oracle license do
-NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
-following license, separately from Oracle's JDK & JRE.  If you do not wish to
-install the Elliptic Curve Cryptography library, you may delete the library
-named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows
-systems) from the JRE bin directory reserved for native libraries.
-
+form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7
+runtime.
+
+The terms of the Oracle license do NOT apply to the Elliptic Curve
+Cryptography library program; it is licensed under the following license,
+separately from the Oracle programs you receive. If you do not wish to install
+this program, you may delete the library named libsunec.so (on Solaris and
+Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory
+reserved for native libraries.
 
 --- begin of LICENSE ---
 
@@ -802,138 +735,13 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to  ECMAScript Language
-Specification ECMA-262 Edition 5.1 which may be included with 
-JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to FontConfig 2.5, which is 
+included with JRE 7, JDK 7, and OpenJDK 7 source distributions on
+Linux and Solaris.
 
 --- begin of LICENSE ---
 
-Copyright notice
-Copyright © 2011 Ecma International
-Ecma International
-Rue du Rhone 114
-CH-1204 Geneva
-Tel: +41 22 849 6000
-Fax: +41 22 849 6001
-Web: http://www.ecma-international.org
-
-This document and possible translations of it may be copied and furnished to
-others, and derivative works that comment on or otherwise explain it or assist
-in its implementation may be prepared, copied, published, and distributed, in
-whole or in part, without restriction of any kind, provided that the above
-copyright notice and this section are included on all such copies and derivative
-works. However, this document itself may not be modified in any way, including
-by removing the copyright notice or references to Ecma International, except as
-needed for the purpose of developing any document or deliverable produced by
-Ecma International (in which case the rules applied to copyrights must be
-followed) or as required to translate it into languages other than English. The
-limited permissions granted above are perpetual and will not be revoked by Ecma
-International or its successors or assigns. This document and the information
-contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL
-DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY
-WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP
-RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE." Software License
-
-All Software contained in this document ("Software)" is protected by copyright
-and is being made available under the "BSD License", included below. This
-Software may be subject to third party rights (rights from parties other than
-Ecma International), including patent rights, and no licenses under such third
-party rights are granted under this license even if the third party concerned is
-a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS
-AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR
-INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO
-IMPLEMENT ECMA INTERNATIONAL STANDARDS*. Redistribution and use in source and
-binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-3. Neither the name of the authors nor Ecma International may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGE.
---- end of LICENSE ---
-
-%% This notice is provided with respect to Dynalink library which is included
-with the Nashorn technology.
-
---- begin of LICENSE ---
-Copyright (c) 2009-2013, Attila Szegedi
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-* Neither the name of the copyright holder nor the names of
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---- end of LICENSE ---
-
-%% This notice is provided with respect to Joni library which is included
-with the Nashorn technology.
-
---- begin of LICENSE ---
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to FontConfig 2.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
-Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright © 2001,2003 Keith Packard
+Copyright © 2001,2003 Keith Packard
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that the
@@ -957,7 +765,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to IAIK PKCS#11 Wrapper, 
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
+which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1008,7 +816,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which 
-may be included with JRE 8, JDK 8, and OpenJDK 8.
+is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1044,8 +852,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to IJG JPEG 6b, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to IJG JPEG 6b, which is 
+included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1083,35 +891,8 @@
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Joni v1.1.9, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to JOpt-Simple v3.0,  which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to JOpt-Simple v3.0,  which is 
+included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1140,39 +921,8 @@
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to JSON, which may be included 
-with JRE 8 & JDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to Kerberos functionality, which 
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
+which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1184,7 +934,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to Kerberos functionality from 
-FundsXpress, INC., which may be included with JRE 8, JDK 8, and OpenJDK 8.
+FundsXpress, INC., which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1217,8 +967,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Kronos OpenGL headers, which may be 
-included with JDK 8 and OpenJDK 8 source distributions.
+%% This notice is provided with respect to Kronos OpenGL headers, which is 
+included with JDK 7 and OpenJDK 7 source distributions.
 
 --- begin of LICENSE ---
 
@@ -1250,8 +1000,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.5.4, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to libpng 1.2.18, which is 
+included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1264,10 +1014,8 @@
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-This code is released under the libpng license.
-
-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
-Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
+libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
+Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
 
@@ -1364,14 +1112,14 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-July 7, 2011
+May 15, 2007
 
 --- end of LICENSE ---
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libungif 4.1.3, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to libungif 4.1.3, which is 
+included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1399,8 +1147,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Little CMS 2.4, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to Little CMS 2.0, which is 
+included with OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1435,7 +1183,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to Mesa 3D Graphics Library v4.1,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions.
+which is included with JRE 7, JDK 7, and OpenJDK 7 source distributions.
 
 --- begin of LICENSE ---
 
@@ -1465,402 +1213,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Mozilla Network Security
-Services (NSS), which is supplied with the JDK test suite in the OpenJDK
-source code repository. It is licensed under Mozilla Public License (MPL),
-version 2.0.
-
-The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
-
-The NSS source code is available in the OpenJDK source code repository at:
-    jdk/test/sun/security/pkcs11/nss/src
-
-The NSS libraries are available in the OpenJDK source code repository at:
-    jdk/test/sun/security/pkcs11/nss/lib
-
---- begin of LICENSE ---
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
+which is included with JRE 7, JDK 7, and OpenJDK 7 on Linux and Solaris.
 
 --- begin of LICENSE ---
 
@@ -1903,30 +1257,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to PorterStemmer v4, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-See: http://tartarus.org/~martin/PorterStemmer
-
-The software is completely free for any purpose, unless notes at the head of
-the program text indicates otherwise (which is rare). In any case, the notes
-about licensing are never more restrictive than the BSD License.
-
-In every case where the software is not written by me (Martin Porter), this
-licensing arrangement has been endorsed by the contributor, and it is
-therefore unnecessary to ask the contributor again to confirm it.
-
-I have not asked any contributors (or their employers, if they have them) for
-proofs that they have the right to distribute their software in this way.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to Relax NG Object/Parser v.20050510,
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
+which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -1953,8 +1285,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to RelaxNGCC v1.12, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to RelaxNGCC v1.12, which is 
+included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -2003,8 +1335,487 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to SAX 2.0.1, which may be included 
-with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to Mozilla Rhino v1.7R3, which 
+is included with JRE 7, JDK 7, and OpenJDK 7
+
+--- begin of LICENSE ---
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A - Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to SAX 2.0.1, which is included 
+with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -2065,8 +1876,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to SoftFloat version 2b, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 on Linux/ARM.
+%% This notice is provided with respect to SoftFloat version 2b, which is 
+included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM.
 
 --- begin of LICENSE ---
 
@@ -2098,12 +1909,21 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Sparkle 1.5,
-which may be included with JRE 8 on Mac OS X.
+%% Portions licensed from Taligent, Inc.
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Thai Dictionary, which is 
+included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
-Copyright (c) 2012 Sparkle.org and Andy Matuschak
+Copyright (C) 1982 The Royal Institute, Thai Royal Government.
+
+Copyright (C) 1998 National Electronics and Computer Technology Center,
+National Science and Technology Development Agency,
+Ministry of Science Technology and Environment,
+Thai Royal Government.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2127,46 +1947,8 @@
 
 -------------------------------------------------------------------------------
 
-%% Portions licensed from Taligent, Inc.
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Thai Dictionary, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-Copyright (C) 1982 The Royal Institute, Thai Royal Government.
-
-Copyright (C) 1998 National Electronics and Computer Technology Center,
-National Science and Technology Development Agency,
-Ministry of Science Technology and Environment,
-Thai Royal Government.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
-%% This notice is provided with respect to Unicode 6.2.0 & CLDR 21.0.1
-which may be included with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to Unicode 6.0.0, CLDR v1.4.1, & CLDR
+v1.9, which is included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
 
@@ -2177,7 +1959,7 @@
 Trademark Usage Policy.
 
 A. Unicode Copyright.
-   1. Copyright © 1991-2013 Unicode, Inc. All rights reserved.
+   1. Copyright © 1991-2011 Unicode, Inc. All rights reserved.
 
    2. Certain documents and files on this website contain a legend indicating
       that "Modification is permitted." Any person is hereby authorized,
@@ -2312,7 +2094,7 @@
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the
+Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under the
 Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -2352,8 +2134,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to UPX v3.01, which may be included 
-with JRE 8 on Windows.
+%% This notice is provided with respect to UPX v3.01, which is included 
+with JRE 7 on Windows.
 
 --- begin of LICENSE ---
 
@@ -2492,7 +2274,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to Xfree86-VidMode Extension 1.0,
-which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
+which is included with JRE 7, JDK 7, and OpenJDK 7 on Linux and Solaris.
 
 --- begin of LICENSE ---
 
@@ -2544,8 +2326,8 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to X Window System 6.8.2, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
+%% This notice is provided with respect to X Window System 6.8.2, which is 
+included with JRE 7, JDK 7, and OpenJDK 7 on Linux and Solaris.
 
 --- begin of LICENSE ---
 
@@ -3349,12 +3131,12 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.5, which may be included 
-with JRE 8, JDK 8, and OpenJDK 8.
+%% This notice is provided with respect to zlib v1.2.3, which is included 
+with JRE 7, JDK 7, and OpenJDK 7
 
 --- begin of LICENSE ---
 
-  version 1.2.5, July 18th, 2005
+  version 1.2.3, July 18th, 2005
 
   Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
 
@@ -3381,18 +3163,16 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to the following which may be 
-included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
-
-  Apache Commons Math 2.2
-  Apache Derby 10.10.1.2        [included with JDK 8]
+%% This notice is provided with respect to the following which is 
+included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
+
+  Apache Derby 10.8.1.2        [included with JDK 7 only]
   Apache Jakarta BCEL 5.2 
   Apache Jakarta Regexp 1.4 
-  Apache Santuario XML Security for Java 1.5.4
+  Apache Santuario XMLSec-Java 1.4.2
   Apache Xalan-Java 2.7.1 
-  Apache Xerces Java 2.10.0 
+  Apache Xerces2 Java 2.10.0 
   Apache XML Resolver 1.1 
-  Dynalink 0.5
 
 
 --- begin of LICENSE ---
--- a/agent/make/Makefile	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/make/Makefile	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/make/mkinstall	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/make/mkinstall	Tue Apr 01 13:57:07 2014 +0200
@@ -27,9 +27,7 @@
 
 cp ../src/os/solaris/proc/amd64/libsaproc.so $SA_NAME/solaris/amd64
 cp ../src/os/solaris/proc/sparc/libsaproc.so $SA_NAME/solaris/sparc
-cp ../src/os/solaris/proc/sparc/libsaproc_audit.so $SA_NAME/solaris/sparc
 cp ../src/os/solaris/proc/sparcv9/libsaproc.so $SA_NAME/solaris/sparcv9
-cp ../src/os/solaris/proc/sparcv9/libsaproc_audit.so $SA_NAME/solaris/sparcv9
 cp ../src/os/solaris/proc/i386/libsaproc.so $SA_NAME/solaris/i386
 cp ../src/os/linux/i386/libsaproc.so $SA_NAME/linux/i386
 cp ../src/os/linux/ia64/libsaproc.so $SA_NAME/linux/ia64
--- a/agent/make/saenv.sh	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/make/saenv.sh	Tue Apr 01 13:57:07 2014 +0200
@@ -48,17 +48,16 @@
      CPU=i386
    fi
 else
-   # configure audit helper library for solaris
-   LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so
-   if [ ! -f $LD_AUDIT_32 ]; then
-     LD_AUDIT_32=$STARTDIR/solaris/`uname -p`/libsaproc_audit.so
-   fi  
-   if [ ! -f $LD_AUDIT_32 ]; then
-      echo "Can't find libsaproc_audit.so."
-      echo "Make sure to build it with 'make natives'."
-      exit 1
+   # configure audit helper library if SA_ALTROOT is set
+   if [ -n "$SA_ALTROOT" ]; then
+     LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so
+     export LD_AUDIT_32
+     if [ ! -f $LD_AUDIT_32 ]; then
+       echo "SA_ALTROOT is set and can't find libsaproc_audit.so."
+       echo "Make sure to build it with 'make natives'."
+       exit 1
+     fi
    fi
-   export LD_AUDIT_32
    SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p`
    OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"
    CPU=sparc
--- a/agent/make/saenv64.sh	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/make/saenv64.sh	Tue Apr 01 13:57:07 2014 +0200
@@ -43,19 +43,16 @@
   fi
 fi
 
-# configure audit helper library
-LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so
-if [ ! -f $LD_AUDIT_64 ]; then
-  LD_AUDIT_64=$STARTDIR/solaris/$CPU/libsaproc_audit.so
+# configure audit helper library if SA_ALTROOT is set
+if [ -n "$SA_ALTROOT" ]; then
+  LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so
+  export LD_AUDIT_64
+  if [ ! -f $LD_AUDIT_64 ]; then
+      echo "SA_ALTROOT is set and can't find libsaproc_audit.so."
+      echo "Make sure to build it with 'make natives'."
+      exit 1
+  fi
 fi
-
-if [ ! -f $LD_AUDIT_64 ]; then
-   echo "Can't find libsaproc_audit.so."
-   echo "Make sure to build it with 'make natives'."
-   exit 1
-fi
-
-export LD_AUDIT_64
 SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/$CPU:$STARTDIR/solaris/$CPU
 
 OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"
--- a/agent/src/os/linux/libproc.h	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/os/linux/libproc.h	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
@@ -80,7 +80,7 @@
 *************************************************************************************/
 
 
-#if defined(sparc) || defined(sparcv9) || defined(ppc64)
+#if defined(sparc)  || defined(sparcv9)
 #define user_regs_struct  pt_regs
 #endif
 
--- a/agent/src/os/linux/libproc_impl.c	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/os/linux/libproc_impl.c	Tue Apr 01 13:57:07 2014 +0200
@@ -29,51 +29,54 @@
 #include <thread_db.h>
 #include "libproc_impl.h"
 
+static const char* alt_root = NULL;
+static int alt_root_len = -1;
+
 #define SA_ALTROOT "SA_ALTROOT"
 
+static void init_alt_root() {
+   if (alt_root_len == -1) {
+      alt_root = getenv(SA_ALTROOT);
+      if (alt_root) {
+         alt_root_len = strlen(alt_root);
+      } else {
+         alt_root_len = 0;
+      }
+   }
+}
+
 int pathmap_open(const char* name) {
-  static const char *alt_root = NULL;
-  static int alt_root_initialized = 0;
+   int fd;
+   char alt_path[PATH_MAX + 1];
 
-  int fd;
-  char alt_path[PATH_MAX + 1], *alt_path_end;
-  const char *s;
+   init_alt_root();
 
-  if (!alt_root_initialized) {
-    alt_root_initialized = -1;
-    alt_root = getenv(SA_ALTROOT);
-  }
+   if (alt_root_len > 0) {
+      strcpy(alt_path, alt_root);
+      strcat(alt_path, name);
+      fd = open(alt_path, O_RDONLY);
+      if (fd >= 0) {
+         print_debug("path %s substituted for %s\n", alt_path, name);
+         return fd;
+      }
 
-  if (alt_root == NULL) {
-    return open(name, O_RDONLY);
-  }
+      if (strrchr(name, '/')) {
+         strcpy(alt_path, alt_root);
+         strcat(alt_path, strrchr(name, '/'));
+         fd = open(alt_path, O_RDONLY);
+         if (fd >= 0) {
+            print_debug("path %s substituted for %s\n", alt_path, name);
+            return fd;
+         }
+      }
+   } else {
+      fd = open(name, O_RDONLY);
+      if (fd >= 0) {
+         return fd;
+      }
+   }
 
-  strcpy(alt_path, alt_root);
-  alt_path_end = alt_path + strlen(alt_path);
-
-  // Strip path items one by one and try to open file with alt_root prepended
-  s = name;
-  while (1) {
-    strcat(alt_path, s);
-    s += 1;
-
-    fd = open(alt_path, O_RDONLY);
-    if (fd >= 0) {
-      print_debug("path %s substituted for %s\n", alt_path, name);
-      return fd;
-    }
-
-    // Linker always put full path to solib to process, so we can rely
-    // on presence of /. If slash is not present, it means, that SOlib doesn't
-    // physically exist (e.g. linux-gate.so) and we fail opening it anyway
-    if ((s = strchr(s, '/')) == NULL) {
-      break;
-    }
-
-    *alt_path_end = 0;
-  }
-
-  return -1;
+   return -1;
 }
 
 static bool _libsaproc_debug;
--- a/agent/src/os/linux/salibelf.c	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/os/linux/salibelf.c	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. 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
--- a/agent/src/os/linux/symtab.c	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/os/linux/symtab.c	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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
@@ -214,10 +214,8 @@
                                 + 2);
   strcpy(debug_pathname, name);
   char *last_slash = strrchr(debug_pathname, '/');
-  if (last_slash == NULL) {
-    free(debug_pathname);
+  if (last_slash == NULL)
     return -1;
-  }
 
   /* Look in the same directory as the object.  */
   strcpy(last_slash+1, debug_filename);
--- a/agent/src/os/solaris/proc/saproc.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/os/solaris/proc/saproc.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/os/win32/windbg/sawindbg.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/os/win32/windbg/sawindbg.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2007, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/HSDB.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/HSDB.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2003, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. 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
@@ -95,15 +95,9 @@
     int entryBci = task.osrBci();
     int compLevel = task.compLevel();
     Klass holder = method.getMethodHolder();
-    out.print("compile " + holder.getName().asString() + " " +
-              OopUtilities.escapeString(method.getName().asString()) + " " +
-              method.getSignature().asString() + " " +
-              entryBci + " " + compLevel);
-    Compile compiler = compilerData();
-    if (compiler != null) {
-      // Dump inlining data.
-      compiler.dumpInlineData(out);
-    }
-    out.println();
+    out.println("compile " + holder.getName().asString() + " " +
+                OopUtilities.escapeString(method.getName().asString()) + " " +
+                method.getSignature().asString() + " " +
+                entryBci + " " + compLevel);
   }
 }
--- a/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java	Tue Apr 01 13:57:07 2014 +0200
@@ -55,21 +55,31 @@
     if (pc == null) {
       return null;
     }
+    List objs = getLoadObjectList();
+    Object[] arr = objs.toArray();
+    // load objects are sorted by base address, do binary search
+    int mid  = -1;
+    int low  = 0;
+    int high = arr.length - 1;
 
-    /* Typically we have about ten loaded objects here. So no reason to do
-      sort/binary search here. Linear search gives us acceptable performance.*/
-
-    List objs = getLoadObjectList();
-
-    for (int i = 0; i < objs.size(); i++) {
-      LoadObject ob = (LoadObject) objs.get(i);
-      Address base = ob.getBase();
-      long size = ob.getSize();
-      if ( pc.greaterThanOrEqual(base) && pc.lessThan(base.addOffsetTo(size))) {
-        return ob;
-      }
+    while (low <= high) {
+       mid = (low + high) >> 1;
+       LoadObject midVal = (LoadObject) arr[mid];
+       long cmp = pc.minus(midVal.getBase());
+       if (cmp < 0) {
+          high = mid - 1;
+       } else if (cmp > 0) {
+          long size = midVal.getSize();
+          if (cmp >= size) {
+             low = mid + 1;
+          } else {
+             return (LoadObject) arr[mid];
+          }
+       } else { // match found
+          return (LoadObject) arr[mid];
+       }
     }
-
+    // no match found.
     return null;
   }
 
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/debugger/windows/x86/WindowsX86CFrame.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayTypeImpl.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayTypeImpl.java	Tue Apr 01 13:57:07 2014 +0200
@@ -24,29 +24,19 @@
 
 package sun.jvm.hotspot.jdi;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.sun.jdi.*;
 
 import sun.jvm.hotspot.oops.ArrayKlass;
+import sun.jvm.hotspot.oops.InstanceKlass;
+import sun.jvm.hotspot.oops.ObjArrayKlass;
+import sun.jvm.hotspot.oops.TypeArrayKlass;
+import sun.jvm.hotspot.oops.Klass;
 import sun.jvm.hotspot.oops.Instance;
-import sun.jvm.hotspot.oops.InstanceKlass;
-import sun.jvm.hotspot.oops.Klass;
-import sun.jvm.hotspot.oops.ObjArrayKlass;
 import sun.jvm.hotspot.oops.Symbol;
-import sun.jvm.hotspot.oops.TypeArrayKlass;
-
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ArrayType;
-import com.sun.jdi.ClassLoaderReference;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.Method;
-import com.sun.jdi.PrimitiveType;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.Type;
-import com.sun.jdi.VirtualMachine;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
 
 public class ArrayTypeImpl extends ReferenceTypeImpl implements ArrayType {
   protected ArrayTypeImpl(VirtualMachine aVm, ArrayKlass aRef) {
@@ -85,8 +75,7 @@
         }
     }
 
-    @Override
-    void addVisibleMethods(Map<String, Method> methodMap, Set<InterfaceType> handledInterfaces) {
+    void addVisibleMethods(Map methodMap) {
         // arrays don't have methods
     }
 
--- a/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java	Tue Apr 01 13:57:07 2014 +0200
@@ -24,30 +24,12 @@
 
 package sun.jvm.hotspot.jdi;
 
-import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.sun.jdi.*;
+import sun.jvm.hotspot.oops.Klass;
 import sun.jvm.hotspot.oops.InstanceKlass;
 
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Field;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.InvocationException;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.Value;
-import com.sun.jdi.VirtualMachine;
+import java.util.*;
+import java.lang.ref.SoftReference;
 
 public class ClassTypeImpl extends ReferenceTypeImpl
     implements ClassType
@@ -213,26 +195,22 @@
         return null;
     }
 
-    @Override
-    void addVisibleMethods(Map<String, Method> methodMap, Set<InterfaceType> seenInterfaces) {
+    void addVisibleMethods(Map methodMap) {
         /*
          * Add methods from
          * parent types first, so that the methods in this class will
          * overwrite them in the hash table
          */
 
-        Iterator<InterfaceType> iter = interfaces().iterator();
+        Iterator iter = interfaces().iterator();
         while (iter.hasNext()) {
             InterfaceTypeImpl interfaze = (InterfaceTypeImpl)iter.next();
-            if (!seenInterfaces.contains(interfaze)) {
-                interfaze.addVisibleMethods(methodMap, seenInterfaces);
-                seenInterfaces.add(interfaze);
-            }
+            interfaze.addVisibleMethods(methodMap);
         }
 
         ClassTypeImpl clazz = (ClassTypeImpl)superclass();
         if (clazz != null) {
-            clazz.addVisibleMethods(methodMap, seenInterfaces);
+            clazz.addVisibleMethods(methodMap);
         }
 
         addToMethodMap(methodMap, methods());
--- a/agent/src/share/classes/sun/jvm/hotspot/jdi/InterfaceTypeImpl.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/jdi/InterfaceTypeImpl.java	Tue Apr 01 13:57:07 2014 +0200
@@ -24,22 +24,15 @@
 
 package sun.jvm.hotspot.jdi;
 
-import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.sun.jdi.*;
 import sun.jvm.hotspot.oops.InstanceKlass;
 
-import com.sun.jdi.ClassNotPreparedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.Method;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.VirtualMachine;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Iterator;
+import java.util.Collections;
+import java.lang.ref.SoftReference;
 
 public class InterfaceTypeImpl extends ReferenceTypeImpl
                                implements InterfaceType {
@@ -103,20 +96,16 @@
         return implementors;
     }
 
-    @Override
-    void addVisibleMethods(Map<String, Method> methodMap, Set<InterfaceType> seenInterfaces) {
+    void addVisibleMethods(Map methodMap) {
         /*
          * Add methods from
          * parent types first, so that the methods in this class will
          * overwrite them in the hash table
          */
-        Iterator<InterfaceType> iter = superinterfaces().iterator();
+        Iterator iter = superinterfaces().iterator();
         while (iter.hasNext()) {
             InterfaceTypeImpl interfaze = (InterfaceTypeImpl)iter.next();
-            if (!seenInterfaces.contains(interfaze)) {
-                interfaze.addVisibleMethods(methodMap, seenInterfaces);
-                seenInterfaces.add(interfaze);
-            }
+            interfaze.addVisibleMethods(methodMap);
         }
 
         addToMethodMap(methodMap, methods());
--- a/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java	Tue Apr 01 13:57:07 2014 +0200
@@ -24,45 +24,24 @@
 
 package sun.jvm.hotspot.jdi;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.io.*;
+
+import com.sun.jdi.*;
 
 import sun.jvm.hotspot.memory.SystemDictionary;
-import sun.jvm.hotspot.oops.ArrayKlass;
-import sun.jvm.hotspot.oops.DefaultHeapVisitor;
 import sun.jvm.hotspot.oops.Instance;
 import sun.jvm.hotspot.oops.InstanceKlass;
+import sun.jvm.hotspot.oops.ArrayKlass;
 import sun.jvm.hotspot.oops.JVMDIClassStatus;
 import sun.jvm.hotspot.oops.Klass;
+import sun.jvm.hotspot.oops.ObjArray;
 import sun.jvm.hotspot.oops.Oop;
 import sun.jvm.hotspot.oops.Symbol;
+import sun.jvm.hotspot.oops.DefaultHeapVisitor;
 import sun.jvm.hotspot.utilities.Assert;
 
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ArrayType;
-import com.sun.jdi.ClassLoaderReference;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassNotPreparedException;
-import com.sun.jdi.ClassObjectReference;
-import com.sun.jdi.Field;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.PrimitiveType;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.Type;
-import com.sun.jdi.Value;
-import com.sun.jdi.VirtualMachine;
+import java.util.*;
+import java.lang.ref.SoftReference;
 
 public abstract class ReferenceTypeImpl extends TypeImpl
 implements ReferenceType {
@@ -442,8 +421,7 @@
         }
     }
 
-    abstract void addVisibleMethods(Map<String, Method> methodMap, Set<InterfaceType> seenInterfaces);
-
+    abstract void addVisibleMethods(Map methodMap);
     public final List visibleMethods() throws ClassNotPreparedException {
         checkPrepared();
         /*
@@ -452,8 +430,8 @@
          * concatenation of name and signature.
          */
         //System.out.println("jj: RTI: Calling addVisibleMethods for:" + this);
-        Map<String, Method> map = new HashMap<String, Method>();
-        addVisibleMethods(map, new HashSet<InterfaceType>());
+        Map map = new HashMap();
+        addVisibleMethods(map);
 
         /*
          * ... but the hash map destroys order. Methods should be
@@ -463,7 +441,7 @@
          */
         //System.out.println("jj: RTI: Calling allMethods for:" + this);
 
-        List<Method> list = new ArrayList<Method>(allMethods());
+        List list = new ArrayList(allMethods());
         //System.out.println("jj: allMethods = " + jjstr(list));
         //System.out.println("jj: map = " + map.toString());
         //System.out.println("jj: map = " + jjstr(map.values()));
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java	Tue Apr 01 14:09:03 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
- * @(#)AdaptiveFreeList.java
- *
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. 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.
- *
- */
-
-package sun.jvm.hotspot.memory;
-
-import java.util.Observable;
-import java.util.Observer;
-
-import sun.jvm.hotspot.debugger.Address;
-import sun.jvm.hotspot.runtime.VM;
-import sun.jvm.hotspot.runtime.VMObject;
-import sun.jvm.hotspot.types.CIntegerField;
-import sun.jvm.hotspot.types.Type;
-import sun.jvm.hotspot.types.TypeDataBase;
-
-public class AdaptiveFreeList extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-      public void update(Observable o, Object data) {
-        initialize(VM.getVM().getTypeDataBase());
-      }
-    });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) {
-    Type type = db.lookupType("AdaptiveFreeList<FreeChunk>");
-    sizeField = type.getCIntegerField("_size");
-    countField = type.getCIntegerField("_count");
-    headerSize = type.getSize();
-  }
-
-  // Fields
-  private static CIntegerField sizeField;
-  private static CIntegerField countField;
-  private static long          headerSize;
-
-  //Constructor
-  public AdaptiveFreeList(Address address) {
-    super(address);
-  }
-
-  // Accessors
-  public long size() {
-    return sizeField.getValue(addr);
-  }
-
-  public long count() {
-    return  countField.getValue(addr);
-  }
-
-  public static long sizeOf() {
-    return headerSize;
-  }
-}
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. 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
@@ -24,29 +24,25 @@
 
 package sun.jvm.hotspot.memory;
 
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
-
-import sun.jvm.hotspot.debugger.Address;
-import sun.jvm.hotspot.debugger.Debugger;
-import sun.jvm.hotspot.oops.ObjectHeap;
-import sun.jvm.hotspot.oops.Oop;
-import sun.jvm.hotspot.runtime.VM;
-import sun.jvm.hotspot.runtime.VMObjectFactory;
-import sun.jvm.hotspot.types.AddressField;
-import sun.jvm.hotspot.types.Type;
-import sun.jvm.hotspot.types.TypeDataBase;
-import sun.jvm.hotspot.utilities.Assert;
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
 
 public class CompactibleFreeListSpace extends CompactibleSpace {
    private static AddressField collectorField;
+
+   // for free size, three fields
+   //       FreeBlockDictionary* _dictionary;        // ptr to dictionary for large size blocks
+   //       FreeList _indexedFreeList[IndexSetSize]; // indexed array for small size blocks
+   //       LinearAllocBlock _smallLinearAllocBlock; // small linear alloc in TLAB
    private static AddressField indexedFreeListField;
    private static AddressField dictionaryField;
    private static long         smallLinearAllocBlockFieldOffset;
+   private static long indexedFreeListSizeOf;
 
    private int    heapWordSize;     // 4 for 32bit, 8 for 64 bits
    private int    IndexSetStart;    // for small indexed list
@@ -113,11 +109,11 @@
       // small chunks
       long size = 0;
       Address cur = addr.addOffsetTo( indexedFreeListField.getOffset() );
-      cur = cur.addOffsetTo(IndexSetStart*AdaptiveFreeList.sizeOf());
+      cur = cur.addOffsetTo(IndexSetStart*FreeList.sizeOf());
       for (int i=IndexSetStart; i<IndexSetSize; i += IndexSetStride) {
-         AdaptiveFreeList freeList = (AdaptiveFreeList) VMObjectFactory.newObject(AdaptiveFreeList.class, cur);
+         FreeList freeList = (FreeList) VMObjectFactory.newObject(FreeList.class, cur);
          size += i*freeList.count();
-         cur= cur.addOffsetTo(IndexSetStride*AdaptiveFreeList.sizeOf());
+         cur= cur.addOffsetTo(IndexSetStride*FreeList.sizeOf());
       }
 
       // large block
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java	Tue Apr 01 13:57:07 2014 +0200
@@ -0,0 +1,72 @@
+/*
+ * @(#)FreeList.java
+ *
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. 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.
+ *
+ */
+
+package sun.jvm.hotspot.memory;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.runtime.*;
+
+public class FreeList extends VMObject {
+   static {
+      VM.registerVMInitializedObserver(new Observer() {
+         public void update(Observable o, Object data) {
+            initialize(VM.getVM().getTypeDataBase());
+         }
+      });
+   }
+
+   private static synchronized void initialize(TypeDataBase db) {
+      Type type = db.lookupType("FreeList<FreeChunk>");
+      sizeField = type.getCIntegerField("_size");
+      countField = type.getCIntegerField("_count");
+      headerSize = type.getSize();
+   }
+
+   // Fields
+   private static CIntegerField sizeField;
+   private static CIntegerField countField;
+   private static long          headerSize;
+
+   //Constructor
+   public FreeList(Address address) {
+     super(address);
+   }
+
+   // Accessors
+   public long size() {
+      return sizeField.getValue(addr);
+   }
+
+   public long count() {
+      return  countField.getValue(addr);
+   }
+
+   public static long sizeOf() {
+     return headerSize;
+  }
+}
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. 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
@@ -152,7 +152,7 @@
 
   private long indexOffset(long index) {
     if (Assert.ASSERTS_ENABLED) {
-      Assert.that(index >= 0 && index < getLength(),  "invalid cp index " + index + " " + getLength());
+      Assert.that(index > 0 && index < getLength(),  "invalid cp index " + index + " " + getLength());
     }
     return (index * getElementSize()) + headerSize;
   }
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/MethodCounters.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/MethodCounters.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2013, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java	Tue Apr 01 13:57:07 2014 +0200
@@ -48,7 +48,7 @@
     preOrderField = new CIntField(type.getCIntegerField("_pre_order"), 0);
     domDepthField = new CIntField(type.getCIntegerField("_dom_depth"), 0);
     idomField = type.getAddressField("_idom");
-    freqField = type.getJDoubleField("_freq");
+    freqField = type.getJFloatField("_freq");
   }
 
   private static AddressField nodesField;
@@ -57,7 +57,7 @@
   private static CIntField preOrderField;
   private static CIntField domDepthField;
   private static AddressField idomField;
-  private static JDoubleField freqField;
+  private static JFloatField freqField;
 
   public Block(Address addr) {
     super(addr);
@@ -67,8 +67,8 @@
     return (int)preOrderField.getValue(getAddress());
   }
 
-  public double freq() {
-    return (double)freqField.getValue(getAddress());
+  public float freq() {
+    return (float)freqField.getValue(getAddress());
   }
 
   public Node_List nodes() {
--- a/agent/src/share/classes/sun/jvm/hotspot/opto/Compile.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/opto/Compile.java	Tue Apr 01 13:57:07 2014 +0200
@@ -25,7 +25,6 @@
 package sun.jvm.hotspot.opto;
 
 import java.util.*;
-import java.io.PrintStream;
 import sun.jvm.hotspot.ci.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.runtime.*;
@@ -93,13 +92,4 @@
     }
     return null;
   }
-
-  public void dumpInlineData(PrintStream out) {
-    InlineTree inlTree = ilt();
-    if (inlTree != null) {
-      out.print(" inline " + inlTree.count());
-      inlTree.dumpReplayData(out);
-    }
-  }
-
 }
--- a/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java	Tue Apr 01 13:57:07 2014 +0200
@@ -87,11 +87,6 @@
     return GrowableArray.create(addr, inlineTreeConstructor);
   }
 
-  public int inlineLevel() {
-    JVMState jvms = callerJvms();
-    return (jvms != null) ? jvms.depth() : 0;
-  }
-
   public void printImpl(PrintStream st, int indent) {
     for (int i = 0; i < indent; i++) st.print(" ");
     st.printf(" @ %d ", callerBci());
@@ -106,28 +101,4 @@
   public void print(PrintStream st) {
     printImpl(st, 2);
   }
-
-  // Count number of nodes in this subtree
-  public int count() {
-    int result = 1;
-    GrowableArray<InlineTree> subt = subtrees();
-    for (int i = 0 ; i < subt.length(); i++) {
-      result += subt.at(i).count();
-    }
-    return result;
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    out.printf(" %d %d ", inlineLevel(), callerBci());
-    Method method = (Method)method().getMetadata();
-    Klass holder = method.getMethodHolder();
-    out.print(holder.getName().asString() + " " +
-              OopUtilities.escapeString(method.getName().asString()) + " " +
-              method.getSignature().asString());
-
-    GrowableArray<InlineTree> subt = subtrees();
-    for (int i = 0 ; i < subt.length(); i++) {
-      subt.at(i).dumpReplayData(out);
-    }
-  }
 }
--- a/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java	Tue Apr 01 13:57:07 2014 +0200
@@ -88,10 +88,6 @@
     return (int)bciField.getValue(getAddress());
   }
 
-  public int depth() {
-    return (int)depthField.getValue(getAddress());
-  }
-
   public JVMState caller() {
     return create(callerField.getValue(getAddress()));
   }
--- a/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2006, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java	Tue Apr 01 13:57:07 2014 +0200
@@ -103,12 +103,11 @@
       }
 
       SystemDictionary dict = VM.getVM().getSystemDictionary();
-      dict.classesDo(new SystemDictionary.ClassVisitor() {
-                        public void visit(Klass k) {
+      dict.classesDo(new SystemDictionary.ClassAndLoaderVisitor() {
+                        public void visit(Klass k, Oop loader) {
                            if (! (k instanceof InstanceKlass)) {
                               return;
                            }
-                           Oop loader = ((InstanceKlass) k).getClassLoader();
                            LoaderData ld = (loader != null) ? (LoaderData)loaderMap.get(loader)
                                                             : bootstrapLoaderData;
                            if (ld != null) {
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2003, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/JInfo.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/JInfo.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2005, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2005, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2003, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2004, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. 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
@@ -98,14 +98,11 @@
            break;
        default: throw new IllegalArgumentException();
        }
-
        if (cpCache == null) {
           return (short) cpCacheIndex;
        } else if (fmt.indexOf("JJJJ") >= 0) {
-          // Invokedynamic require special handling
-          cpCacheIndex = ~cpCacheIndex;
-          cpCacheIndex = bytes.swapInt(cpCacheIndex);
-          return (short) cpCache.getEntryAt(cpCacheIndex).getConstantPoolIndex();
+          // change byte-ordering and go via secondary cache entry
+           throw new InternalError("unimplemented");
        } else if (fmt.indexOf("JJ") >= 0) {
           // change byte-ordering and go via cache
           return (short) cpCache.getEntryAt((int) (0xFFFF & bytes.swapShort((short)cpCacheIndex))).getConstantPoolIndex();
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2006, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
@@ -61,9 +61,8 @@
     long h = 0;
     int s = 0;
     int len = buf.length;
-    // Emulate the unsigned int in java_lang_String::hash_code
     while (len-- > 0) {
-      h = 31*h + (0xFFFFFFFFL & buf[s]);
+      h = 31*h + (0xFFL & buf[s]);
       s++;
     }
     return h & 0xFFFFFFFFL;
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. 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
--- a/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Tue Apr 01 14:09:03 2014 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js	Tue Apr 01 13:57:07 2014 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. 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
@@ -371,23 +371,19 @@
    return sa.dbg.lookup(dso, sym);
 }
 
-function loadObjectContainingPC(addr) {
-    if (sa.cdbg == null) {
+// returns the ClosestSymbol or null
+function closestSymbolFor(addr) {
+   if (sa.cdbg == null) {
       // no CDebugger support, return null
       return null;
-    }
-
-    return  sa.cdbg.loadObjectContainingPC(addr);
-}
-
-// returns the ClosestSymbol or null
-function closestSymbolFor(addr) {
-    var dso = loadObjectContainingPC(addr);
-    if (dso != null) {
-      return dso.closestSymbolToPC(addr);
-    }
-
-    return null;
+   } else {
+      var dso = sa.cdbg.loadObjectContainingPC(addr);
+      if (dso != null) {
+         return dso.closestSymbolToPC(addr);
+      } else {
+         return null;
+      }
+   }
 }
 
 // Address-to-symbol
@@ -808,16 +804,6 @@
 // VM type to SA class map
 var  vmType2Class = new Object();
 
-// C2 only classes
-try{
-  vmType2Class["ExceptionBlob"] = sapkg.code.ExceptionBlob;
-  vmType2Class["UncommonTrapBlob"] = sapkg.code.UncommonTrapBlob;
-} catch(e) {
-  // Ignore exception. C2 specific objects might be not 
-  // available in client VM
-}
-
-
 // This is *not* exhaustive. Add more if needed.
 // code blobs
 vmType2Class["BufferBlob"] = sapkg.code.BufferBlob;
@@ -826,8 +812,10 @@
 vmType2Class["SafepointBlob"] = sapkg.code.SafepointBlob;
 vmType2Class["C2IAdapter"] = sapkg.code.C2IAdapter;
 vmType2Class["DeoptimizationBlob"] = sapkg.code.DeoptimizationBlob;
+vmType2Class["ExceptionBlob"] = sapkg.code.ExceptionBlob;
 vmType2Class["I2CAdapter"] = sapkg.code.I2CAdapter;
 vmType2Class["OSRAdapter"] = sapkg.code.OSRAdapter;
+vmType2Class["UncommonTrapBlob"] = sapkg.code.UncommonTrapBlob;
 vmType2Class["PCDesc"] = sapkg.code.PCDesc;
 
 // interpreter
@@ -888,29 +876,21 @@
 
 // returns description of given pointer as a String
 function whatis(addr) {
-  addr = any2addr(addr);
-  var ptrLoc = findPtr(addr);
-  if (!ptrLoc.isUnknown()) {
-    return ptrLoc.toString();
-  }
-
-  var vmType = vmTypeof(addr);
-  if (vmType != null) {
-    return "pointer to " + vmType.name;
-  }
-
-  var dso = loadObjectContainingPC(addr);
-  if (dso == null) {
-    return ptrLoc.toString();
-  }
-
-  var sym = dso.closestSymbolToPC(addr);
-  if (sym != null) {
-    return sym.name + '+' + sym.offset;
-  }
-
-  var s = dso.getName();
-  var p = s.lastIndexOf("/");
-  var base = dso.getBase();
-  return s.substring(p+1, s.length) + '+' + addr.minus(base);
+   addr = any2addr(addr);
+   var ptrLoc = findPtr(addr);
+   if (ptrLoc.isUnknown()) {
+      var vmType = vmTypeof(addr);
+      if (vmType != null) {
+         return "pointer to " + vmType.name;
+      } else {
+         var sym = closestSymbolFor(addr);
+         if (sym != null) {
+            return sym.name + '+' + sym.offset;
+         } else {
+            return ptrLoc.toString();
+         }
+      }
+   } else {
+      return ptrLoc.toString();
+   }
 }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Tue Apr 01 13:57:07 2014 +0200
@@ -1301,7 +1301,6 @@
     @HotSpotVMConstant(name = "DataLayout::call_type_data_tag") @Stable public int dataLayoutCallTypeDataTag;
     @HotSpotVMConstant(name = "DataLayout::virtual_call_type_data_tag") @Stable public int dataLayoutVirtualCallTypeDataTag;
     @HotSpotVMConstant(name = "DataLayout::parameters_type_data_tag") @Stable public int dataLayoutParametersTypeDataTag;
-    @HotSpotVMConstant(name = "DataLayout::speculative_trap_data_tag") @Stable public int dataLayoutSpeculativeTrapDataTag;
 
     @HotSpotVMFlag(name = "BciProfileWidth") @Stable public int bciProfileWidth;
     @HotSpotVMFlag(name = "TypeProfileWidth") @Stable public int typeProfileWidth;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java	Tue Apr 01 13:57:07 2014 +0200
@@ -62,7 +62,6 @@
         null, // call_type_data_tag
         null, // virtual_call_type_data_tag
         null, // parameters_type_data_tag
-        null  // speculative_trap_data_tag
     };
     // @formatter:on
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodDataAccessor.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodDataAccessor.java	Tue Apr 01 13:57:07 2014 +0200
@@ -52,8 +52,7 @@
         ArgInfoData(config().dataLayoutArgInfoDataTag),
         CallTypeData(config().dataLayoutCallTypeDataTag),
         VirtualCallTypeData(config().dataLayoutVirtualCallTypeDataTag),
-        ParametersTypeData(config().dataLayoutParametersTypeDataTag),
-        SpeculativeTrapData(config().dataLayoutSpeculativeTrapDataTag);
+        ParametersTypeData(config().dataLayoutParametersTypeDataTag);
 
         private final int value;
 
@@ -81,21 +80,21 @@
 
     /**
      * Returns the {@link Tag} stored in the LayoutData header.
-     * 
+     *
      * @return tag stored in the LayoutData header
      */
     Tag getTag();
 
     /**
      * Returns the BCI stored in the LayoutData header.
-     * 
+     *
      * @return An integer &ge; 0 and &le; Short.MAX_VALUE, or -1 if not supported.
      */
     int getBCI(HotSpotMethodData data, int position);
 
     /**
      * Computes the size for the specific data at the given position.
-     * 
+     *
      * @return An integer &gt; 0.
      */
     int getSize(HotSpotMethodData data, int position);
--- a/make/Makefile	Tue Apr 01 14:09:03 2014 +0200
+++ b/make/Makefile	Tue Apr 01 13:57:07 2014 +0200
@@ -90,11 +90,10 @@
 # Typical C1/C2 targets made available with this Makefile
 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
 C2_VM_TARGETS=product  fastdebug  optimized  debug
-GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal
-CORE_VM_TARGETS=productcore fastdebugcore optimizedcore debugcore
 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
+GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal
 
 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
@@ -129,12 +128,6 @@
 
 all_optimized: optimized optimized1 docs export_optimized
 
-allgraal:           all_productgraal all_fastdebuggraal
-all_productgraal:   productgraal docs export_product
-all_fastdebuggraal: fastdebuggraal docs export_fastdebug
-all_debuggraal:     debuggraal docs export_debug
-all_optimizedgraal: optimizedgraal docs export_optimized
-
 allzero:           all_productzero all_fastdebugzero
 all_productzero:   productzero docs export_product
 all_fastdebugzero: fastdebugzero docs export_fastdebug
@@ -147,11 +140,11 @@
 all_debugshark:     debugshark 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:     debugcore docs export_debug
-all_optimizedcore: optimizedcore docs export_optimized
+allgraal:           all_productgraal all_fastdebuggraal
+all_productgraal:   productgraal docs export_product
+all_fastdebuggraal: fastdebuggraal docs export_fastdebug
+all_debuggraal:     debuggraal docs export_debug
+all_optimizedgraal: optimizedgraal docs export_optimized
 
 # Do everything
 world:         all create_jdk
@@ -172,10 +165,10 @@
 C1_DIR      =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
 C2_DIR      =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
 GRAAL_DIR   =$(OUTPUTDIR)/$(VM_PLATFORM)_graal
-CORE_DIR    =$(OUTPUTDIR)/$(VM_PLATFORM)_core
 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
 ZERO_DIR    =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
 SHARK_DIR   =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
+GRAAL_DIR   =$(OUTPUTDIR)/$(VM_PLATFORM)_graal
 
 # Build variation of hotspot
 $(C1_VM_TARGETS):
@@ -186,10 +179,6 @@
 	$(CD) $(GAMMADIR)/make; \
 	$(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
 
-$(CORE_VM_TARGETS):
-	$(CD) $(GAMMADIR)/make; \
-	$(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:%core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-
 $(ZERO_VM_TARGETS):
 	$(CD) $(GAMMADIR)/make; \
 	$(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
@@ -251,20 +240,6 @@
 		      $(MAKE_ARGS) $(VM_TARGET)
 endif
 
-generic_buildcore: $(HOTSPOT_SCRIPT)
-ifeq ($(HS_ARCH),ppc)
-  ifeq ($(ARCH_DATA_MODEL),64)
-	$(MKDIR) -p $(OUTPUTDIR)
-	$(CD) $(OUTPUTDIR); \
-		$(MAKE) -f $(ABS_OS_MAKEFILE) \
-			$(MAKE_ARGS) $(VM_TARGET)
-  else
-	@$(ECHO) "No ($(VM_TARGET)) for ppc ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
-  endif
-else
-	@$(ECHO) "No ($(VM_TARGET)) for $(HS_ARCH)"
-endif
-
 generic_buildzero: $(HOTSPOT_SCRIPT)
 	$(MKDIR) -p $(OUTPUTDIR)
 	$(CD) $(OUTPUTDIR); \
@@ -336,7 +311,6 @@
 C1_BUILD_DIR      =$(C1_DIR)/$(BUILD_FLAVOR)
 C2_BUILD_DIR      =$(C2_DIR)/$(BUILD_FLAVOR)
 GRAAL_BUILD_DIR   =$(GRAAL_DIR)/$(BUILD_FLAVOR)
-CORE_BUILD_DIR    =$(CORE_DIR)/$(BUILD_FLAVOR)
 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
 ZERO_BUILD_DIR    =$(ZERO_DIR)/$(BUILD_FLAVOR)
 SHARK_BUILD_DIR   =$(SHARK_DIR)/$(BUILD_FLAVOR)
@@ -563,28 +537,6 @@
 	$(install-dir)
 endif
 
-# Core
-ifeq ($(JVM_VARIANT_CORE), true)
-# Common
-$(EXPORT_LIB_DIR)/%.jar:			$(CORE_BUILD_DIR)/../generated/%.jar
-	$(install-file)
-$(EXPORT_INCLUDE_DIR)/%:			$(CORE_BUILD_DIR)/../generated/jvmtifiles/%
-	$(install-file)
-# Unix
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX):	$(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
-	$(install-file)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(CORE_BUILD_DIR)/%.debuginfo
-	$(install-file)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(CORE_BUILD_DIR)/%.diz
-	$(install-file)
-$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):	$(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
-	$(install-file)
-$(EXPORT_SERVER_DIR)/%.debuginfo:		$(CORE_BUILD_DIR)/%.debuginfo
-	$(install-file)
-$(EXPORT_SERVER_DIR)/%.diz:			$(CORE_BUILD_DIR)/%.diz
-	$(install-file)
-endif
-
 # Shark
 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
 # Common
@@ -657,7 +609,6 @@
 	$(RM) -r $(C1_DIR)
 	$(RM) -r $(C2_DIR)
 	$(RM) -r $(GRAAL_DIR)
-	$(RM) -r $(CORE_DIR)
 	$(RM) -r $(ZERO_DIR)
 	$(RM) -r $(SHARK_DIR)
 	$(RM) -r $(MINIMAL1_DIR)
@@ -684,11 +635,11 @@
 
 
 # Testing the built JVM
-RUN_JVM=JAVA_HOME=$(JDK_IMPORT_PATH) $(JDK_IMPORT_PATH)/bin/java -d$(ARCH_DATA_MODEL) -XXaltjvm=$(ALTJVM_DIR) -Dsun.java.launcher.is_altjvm=true
+RUN_JVM=JAVA_HOME=$(JDK_IMPORT_PATH) $(JDK_IMPORT_PATH)/bin/java -d$(ARCH_DATA_MODEL) -Dsun.java.launcher=gamma
 generic_test:
 	@$(ECHO) "Running with: $(ALTJVM_DIR)"
-	@$(RUN_JVM) -Xinternalversion
-	@$(RUN_JVM) -showversion -help
+	@$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion
+	@$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
 
 # C2 test targets
 test_product test_optimized test_fastdebug test_debug:
--- a/make/aix/Makefile	Tue Apr 01 14:09:03 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,377 +0,0 @@
-#
-# Copyright (c) 1999, 2013, 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"
-
-# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding.
-# JDI binding on SA produces two binaries:
-#  1. sa-jdi.jar       - This is built before building libjvm.so
-#                        Please refer to ./makefiles/sa.make
-#  2. libsa.so         - Native library for SA - This is built after
-#                        libjsig.so (signal interposition library)
-#                        Please refer to ./makefiles/vm.make
-# If $(GAMMADIR)/agent dir is not present, SA components are not built.
-
-# No tests on Aix.
-TEST_IN_BUILD=false
-
-ifeq ($(GAMMADIR),)
-include ../../make/defs.make
-else
-include $(GAMMADIR)/make/defs.make
-endif
-include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
-
-ifndef CC_INTERP
-  ifndef FORCE_TIERED
-    FORCE_TIERED=1
-  endif
-endif
-
-ifdef LP64
-  ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
-    _JUNK_ := $(shell echo >&2 \
-       $(OSNAME) $(ARCH) "*** ERROR: this platform does not support 64-bit compilers!")
-	@exit 1
-  endif
-endif
-
-# we need to set up LP64 correctly to satisfy sanity checks in adlc
-ifneq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
-  MFLAGS += " LP64=1 "
-endif
-
-# pass USE_SUNCC further, through MFLAGS
-ifdef USE_SUNCC
-  MFLAGS += " USE_SUNCC=1 "
-endif
-
-# The following renders pathnames in generated Makefiles valid on
-# machines other than the machine containing the build tree.
-#
-# For example, let's say my build tree lives on /files12 on
-# exact.east.sun.com.  This logic will cause GAMMADIR to begin with
-# /net/exact/files12/...
-#
-# We only do this on SunOS variants, for a couple of reasons:
-#  * It is extremely rare that source trees exist on other systems
-#  * It has been claimed that the Linux automounter is flakey, so
-#    changing GAMMADIR in a way that exercises the automounter could
-#    prove to be a source of unreliability in the build process.
-# Obviously, this Makefile is only relevant on SunOS boxes to begin
-# with, but the SunOS conditionalization will make it easier to
-# combine Makefiles in the future (assuming we ever do that).
-
-ifeq ($(OSNAME),solaris)
-
-  #   prepend current directory to relative pathnames.
-  NEW_GAMMADIR :=                                    \
-    $(shell echo $(GAMMADIR) |                       \
-      sed -e "s=^\([^/].*\)=$(shell pwd)/\1="        \
-     )
-  unexport NEW_GAMMADIR
-
-  # If NEW_GAMMADIR doesn't already start with "/net/":
-  ifeq ($(strip $(filter /net/%,$(NEW_GAMMADIR))),)
-    #   prepend /net/$(HOST)
-    #   remove /net/$(HOST) if name already began with /home/
-    #   remove /net/$(HOST) if name already began with /java/
-    #   remove /net/$(HOST) if name already began with /lab/
-    NEW_GAMMADIR :=                                     \
-         $(shell echo $(NEW_GAMMADIR) |                 \
-                 sed -e "s=^\(.*\)=/net/$(HOST)\1="     \
-                     -e "s=^/net/$(HOST)/home/=/home/=" \
-                     -e "s=^/net/$(HOST)/java/=/java/=" \
-                     -e "s=^/net/$(HOST)/lab/=/lab/="   \
-          )
-    # Don't use the new value for GAMMADIR unless a file with the new
-    # name actually exists.
-    ifneq ($(wildcard $(NEW_GAMMADIR)),)
-      GAMMADIR := $(NEW_GAMMADIR)
-    endif
-  endif
-
-endif
-
-# BUILDARCH is set to "zero" for Zero builds.  VARIANTARCH
-# is used to give the build directories meaningful names.
-VARIANTARCH = $(subst i386,i486,$(ZERO_LIBARCH))
-
-# There is a (semi-) regular correspondence between make targets and actions:
-#
-#       Target          Tree Type       Build Dir
-#
-#       debug           compiler2       <os>_<arch>_compiler2/debug
-#       fastdebug       compiler2       <os>_<arch>_compiler2/fastdebug
-#       optimized       compiler2       <os>_<arch>_compiler2/optimized
-#       product         compiler2       <os>_<arch>_compiler2/product
-#
-#       debug1          compiler1       <os>_<arch>_compiler1/debug
-#       fastdebug1      compiler1       <os>_<arch>_compiler1/fastdebug
-#       optimized1      compiler1       <os>_<arch>_compiler1/optimized
-#       product1        compiler1       <os>_<arch>_compiler1/product
-#
-#       debugcore       core            <os>_<arch>_core/debug
-#       fastdebugcore   core            <os>_<arch>_core/fastdebug
-#       optimizedcore   core            <os>_<arch>_core/optimized
-#       productcore     core            <os>_<arch>_core/product
-#
-#       debugzero       zero            <os>_<arch>_zero/debug
-#       fastdebugzero   zero            <os>_<arch>_zero/fastdebug
-#       optimizedzero   zero            <os>_<arch>_zero/optimized
-#       productzero     zero            <os>_<arch>_zero/product
-#
-#       debugshark      shark           <os>_<arch>_shark/debug
-#       fastdebugshark  shark           <os>_<arch>_shark/fastdebug
-#       optimizedshark  shark           <os>_<arch>_shark/optimized
-#       productshark    shark           <os>_<arch>_shark/product
-#
-#       fastdebugminimal1 minimal1      <os>_<arch>_minimal1/fastdebug
-#       productminimal1   minimal1      <os>_<arch>_minimal1/product
-#
-# What you get with each target:
-#
-# debug*     - debug compile with asserts enabled
-# fastdebug* - optimized compile, but with asserts enabled
-# optimized* - optimized compile, no asserts
-# product*   - the shippable thing:  optimized compile, no asserts, -DPRODUCT
-
-# This target list needs to be coordinated with the usage message
-# in the build.sh script:
-TARGETS           = debug fastdebug optimized product
-
-ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
-  SUBDIR_DOCS     = $(OSNAME)_$(VARIANTARCH)_docs
-else
-  SUBDIR_DOCS     = $(OSNAME)_$(BUILDARCH)_docs
-endif
-SUBDIRS_C1        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
-SUBDIRS_C2        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
-SUBDIRS_TIERED    = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
-SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
-SUBDIRS_ZERO      = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
-SUBDIRS_SHARK     = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
-SUBDIRS_MINIMAL1  = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS))
-
-TARGETS_C2        = $(TARGETS)
-TARGETS_C1        = $(addsuffix 1,$(TARGETS))
-TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
-TARGETS_CORE      = $(addsuffix core,$(TARGETS))
-TARGETS_ZERO      = $(addsuffix zero,$(TARGETS))
-TARGETS_SHARK     = $(addsuffix shark,$(TARGETS))
-TARGETS_MINIMAL1 =  $(addsuffix minimal1,$(TARGETS))
-
-BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
-BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
-BUILDTREE_VARS   += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
-BUILDTREE_VARS   += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
-
-BUILDTREE         = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
-
-#-------------------------------------------------------------------------------
-
-# Could make everything by default, but that would take a while.
-all:
-	@echo "Try '$(MAKE) <target> ...'  where <target> is one or more of"
-	@echo "  $(TARGETS_C2)"
-	@echo "  $(TARGETS_C1)"
-	@echo "  $(TARGETS_CORE)"
-	@echo "  $(TARGETS_ZERO)"
-	@echo "  $(TARGETS_SHARK)"
-	@echo "  $(TARGETS_MINIMAL1)"
-
-checks: check_os_version check_j2se_version
-
-# We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
-# Solaris 2.5.1, 2.6).
-# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
-
-SUPPORTED_OS_VERSION = AIX
-OS_VERSION := $(shell uname -a)
-EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
-
-check_os_version:
-ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),)
-	$(QUIETLY) >&2 echo "*** This OS is not supported:" `uname -a`; exit 1;
-endif
-
-# jvmti.make requires XSLT (J2SE 1.4.x or newer):
-XSLT_CHECK	= $(REMOTE) $(RUN.JAVAP) javax.xml.transform.TransformerFactory
-# If not found then fail fast.
-check_j2se_version:
-	$(QUIETLY) $(XSLT_CHECK) > /dev/null 2>&1; \
-	if [ $$? -ne 0 ]; then \
-	  $(REMOTE) $(RUN.JAVA) -version; \
-	  echo "*** An XSLT processor (J2SE 1.4.x or newer) is required" \
-	  "to bootstrap this build" 1>&2; \
-	  exit 1; \
-	fi
-
-$(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-	$(BUILDTREE) VARIANT=tiered
-
-$(SUBDIRS_C2): $(BUILDTREE_MAKE)
-ifeq ($(FORCE_TIERED),1)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-		$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
-else
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-		$(BUILDTREE) VARIANT=compiler2
-endif
-
-$(SUBDIRS_C1): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-	$(BUILDTREE) VARIANT=compiler1
-
-$(SUBDIRS_CORE): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-	$(BUILDTREE) VARIANT=core
-
-$(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-	$(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
-
-$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-	$(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
-
-$(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-	$(BUILDTREE) VARIANT=minimal1
-
-
-platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
-	$(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
-
-# Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
-
-$(TARGETS_C2):  $(SUBDIRS_C2)
-	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-ifdef INSTALL
-	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
-endif
-
-$(TARGETS_TIERED):  $(SUBDIRS_TIERED)
-	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-ifdef INSTALL
-	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
-endif
-
-$(TARGETS_C1):  $(SUBDIRS_C1)
-	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-ifdef INSTALL
-	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
-endif
-
-$(TARGETS_CORE):  $(SUBDIRS_CORE)
-	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-ifdef INSTALL
-	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
-endif
-
-$(TARGETS_ZERO):  $(SUBDIRS_ZERO)
-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
-ifdef INSTALL
-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
-endif
-
-$(TARGETS_SHARK):  $(SUBDIRS_SHARK)
-	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
-ifdef INSTALL
-	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
-endif
-
-$(TARGETS_MINIMAL1):  $(SUBDIRS_MINIMAL1)
-	cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS)
-ifdef INSTALL
-	cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install
-endif
-
-# Just build the tree, and nothing else:
-tree:      $(SUBDIRS_C2)
-tree1:     $(SUBDIRS_C1)
-treecore:  $(SUBDIRS_CORE)
-treezero:  $(SUBDIRS_ZERO)
-treeshark: $(SUBDIRS_SHARK)
-treeminimal1: $(SUBDIRS_MINIMAL1)
-
-# Doc target.  This is the same for all build options.
-#     Hence create a docs directory beside ...$(ARCH)_[...]
-# We specify 'BUILD_FLAVOR=product' so that the proper
-# ENABLE_FULL_DEBUG_SYMBOLS value is used.
-docs: checks
-	$(QUIETLY) mkdir -p $(SUBDIR_DOCS)
-	$(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
-
-# Synonyms for win32-like targets.
-compiler2:  debug product
-
-compiler1:  debug1 product1
-
-core: debugcore productcore
-
-zero: debugzero productzero
-
-shark: debugshark productshark
-
-clean_docs:
-	rm -rf $(SUBDIR_DOCS)
-
-clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_minimal1:
-	rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
-
-clean:  clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_minimal1 clean_docs
-
-include $(GAMMADIR)/make/cscope.make
-
-#-------------------------------------------------------------------------------
-
-.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_MINIMAL1)
-.PHONY: tree tree1 treecore treezero treeshark
-.PHONY: all compiler1 compiler2 core zero shark
-.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
-.PHONY: checks check_os_version check_j2se_version
--- a/make/aix/adlc_updater	Tue Apr 01 14:09:03 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#! /bin/sh
-#
-# This file is used by adlc.make to selectively update generated
-# adlc files. Because source and target diretories are relative
-# paths, this file is copied to the target build directory before
-# use.
-#
-# adlc-updater <file> <source-dir> <target-dir>
-#
-fix_lines() {
-  # repair bare #line directives in $1 to refer to $2
-  awk < $1 > $1+ '
-    /^#line 999999$/ {print "#line " (NR+1) " \"" F2 "\""; next}
-    {print}
-  ' F2=$2
-  mv $1+ $1
-}
-fix_lines $2/$1 $3/$1
-[ -f $3/$1 ] && cmp -s $2/$1 $3/$1 || \
-( [ -f $3/$1 ] && echo Updating $3/$1 ; touch $2/made-change ; mv $2/$1 $3/$1 )
--- a/make/aix/makefiles/adjust-mflags.sh	Tue Apr 01 14:09:03 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. 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 script is used only from top.make.
-# The macro $(MFLAGS-adjusted) calls this script to
-# adjust the "-j" arguments to take into account
-# the HOTSPOT_BUILD_JOBS variable.  The default
-# handling of the "-j" argument by gnumake does
-# not meet our needs, so we must adjust it ourselves.
-
-# This argument adjustment applies to two recursive
-# calls to "$(MAKE) $(MFLAGS-adjusted)" in top.make.
-# One invokes adlc.make, and the other invokes vm.make.
-# The adjustment propagates the desired concurrency
-# level down to the sub-make (of the adlc or vm).
-# The default behavior of gnumake is to run all
-# sub-makes without concurrency ("-j1").
-
-# Also, we use a make variable rather than an explicit
-# "-j<N>" argument to control this setting, so that
-# the concurrency setting (which must be tuned separately
-# for each MP system) can be set via an environment variable.
-# The recommended setting is 1.5x to 2x the number of available
-# CPUs on the MP system, which is large enough to keep the CPUs
-# busy (even though some jobs may be I/O bound) but not too large,
-# we may presume, to overflow the system's swap space.
-
-set -eu
-
-default_build_jobs=4
-
-case $# in
-[12])	true;;
-*)	>&2 echo "Usage: $0 ${MFLAGS} ${HOTSPOT_BUILD_JOBS}"; exit 2;;
-esac
-
-MFLAGS=$1
-HOTSPOT_BUILD_JOBS=${2-}
-
-# Normalize any -jN argument to the form " -j${HBJ}"
-MFLAGS=`
-	echo "$MFLAGS" \
-	| sed '
-		s/^-/ -/
-		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
-		s/ -j[0-9][0-9]*/ -j/
-		s/ -j\([^ 	]\)/ -j -\1/
-		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-	' `
-
-case ${HOTSPOT_BUILD_JOBS} in \
-
-'') case ${MFLAGS} in
-    *\ -j*)
-	>&2 echo "# Note: -jN is ineffective for setting parallelism in this makefile." 
-	>&2 echo "# please set HOTSPOT_BUILD_JOBS=${default_build_jobs} in the command line or environment."
-    esac;;
-
-?*) case ${MFLAGS} in
-     *\ -j*) true;;
-     *)      MFLAGS="-j${HOTSPOT_BUILD_JOBS} ${MFLAGS}";;
-    esac;;
-esac
-
-echo "${MFLAGS}"
--- a/make/aix/makefiles/adlc.make	Tue Apr 01 14:09:03 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-#
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. 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 (adlc.make) is included from the adlc.make in the
-# build directories.
-# It knows how to compile, link, and run the adlc.
-
-include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make
-
-# #########################################################################
-
-# OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make:
-GENERATED = ../generated
-OUTDIR  = $(GENERATED)/adfiles
-
-ARCH = $(Platform_arch)
-OS = $(Platform_os_family)
-
-SOURCE.AD = $(OUTDIR)/$(OS)_$(Platform_arch_model).ad 
-
-ifeq ("${Platform_arch_model}", "${Platform_arch}")
-  SOURCES.AD = \
-  $(call altsrc-replace,$(HS_COMMON_SRC)/cpu/$(ARCH)/vm/$(Platform_arch_model).ad) 
-else
-  SOURCES.AD = \
-  $(call altsrc-replace,$(HS_COMMON_SRC)/cpu/$(ARCH)/vm/$(Platform_arch_model).ad) \
-  $(call altsrc-replace,$(HS_COMMON_SRC)/cpu/$(ARCH)/vm/$(Platform_arch).ad) 
-endif
-
-EXEC = $(OUTDIR)/adlc
-
-# set VPATH so make knows where to look for source files
-Src_Dirs_V += $(GAMMADIR)/src/share/vm/adlc
-VPATH += $(Src_Dirs_V:%=%:)
-
-# set INCLUDES for C preprocessor
-Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED)
-INCLUDES += $(Src_Dirs_I:%=-I%)
-
-# set flags for adlc compilation
-CXXFLAGS = $(SYSDEFS) $(INCLUDES)
-
-# Force assertions on.
-CXXFLAGS += -DASSERT
-
-# CFLAGS_WARN holds compiler options to suppress/enable warnings.
-# Suppress warnings (for now)
-CFLAGS_WARN = -w
-CFLAGS += $(CFLAGS_WARN)
-
-OBJECTNAMES = \
-	adlparse.o \
-	archDesc.o \
-	arena.o \
-	dfa.o \
-	dict2.o \
-	filebuff.o \
-	forms.o \
-	formsopt.o \
-	formssel.o \
-	main.o \
-	adlc-opcodes.o \
-	output_c.o \
-	output_h.o \
-
-OBJECTS = $(OBJECTNAMES:%=$(OUTDIR)/%)
-
-GENERATEDNAMES = \
-        ad_$(Platform_arch_model).cpp \
-        ad_$(Platform_arch_model).hpp \
-        ad_$(Platform_arch_model)_clone.cpp \
-        ad_$(Platform_arch_model)_expand.cpp \
-        ad_$(Platform_arch_model)_format.cpp \
-        ad_$(Platform_arch_model)_gen.cpp \
-        ad_$(Platform_arch_model)_misc.cpp \
-        ad_$(Platform_arch_model)_peephole.cpp \
-        ad_$(Platform_arch_model)_pipeline.cpp \
-        adGlobals_$(Platform_arch_model).hpp \
-        dfa_$(Platform_arch_model).cpp \
-
-GENERATEDFILES = $(GENERATEDNAMES:%=$(OUTDIR)/%)
-
-# #########################################################################
-
-all: $(EXEC)
-
-$(EXEC) : $(OBJECTS)
-	@echo Making adlc
-	$(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
-
-# Random dependencies:
-$(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp
-
-# The source files refer to ostream.h, which sparcworks calls iostream.h
-$(OBJECTS): ostream.h
-
-ostream.h :
-	@echo >$@ '#include <iostream.h>'
-
-dump:
-	: OUTDIR=$(OUTDIR)
-	: OBJECTS=$(OBJECTS)
-	: products = $(GENERATEDFILES)
-
-all: $(GENERATEDFILES)
-
-$(GENERATEDFILES): refresh_adfiles
-
-# Get a unique temporary directory name, so multiple makes can run in parallel.
-# Note that product files are updated via "mv", which is atomic.
-TEMPDIR := $(OUTDIR)/mktmp$(shell echo $$$$)
-
-# Debuggable by default
-CFLAGS += -g
-
-# Pass -D flags into ADLC.
-ADLCFLAGS += $(SYSDEFS)
-
-# Note "+="; it is a hook so flags.make can add more flags, like -g or -DFOO.
-ADLCFLAGS += -q -T
-
-# Normally, debugging is done directly on the ad_<arch>*.cpp files.
-# But -g will put #line directives in those files pointing back to <arch>.ad.
-# Some builds of gcc 3.2 have a bug that gets tickled by the extra #line directives
-# so skip it for 3.2 and ealier.
-ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
-ADLCFLAGS += -g
-endif
-
-ifdef LP64
-ADLCFLAGS += -D_LP64
-else
-ADLCFLAGS += -U_LP64
-endif
-
-#
-# adlc_updater is a simple sh script, under sccs control. It is
-# used to selectively update generated adlc files. This should
-# provide a nice compilation speed improvement.
-#
-ADLC_UPDATER_DIRECTORY = $(GAMMADIR)/make/$(OS)
-ADLC_UPDATER = adlc_updater
-$(ADLC_UPDATER): $(ADLC_UPDATER_DIRECTORY)/$(ADLC_UPDATER)
-	$(QUIETLY) cp $< $@; chmod +x $@
-
-# This action refreshes all generated adlc files simultaneously.
-# The way it works is this:
-# 1) create a scratch directory to work in.
-# 2) if the current working directory does not have $(ADLC_UPDATER), copy it.
-# 3) run the compiled adlc executable. This will create new adlc files in the scratch directory.
-# 4) call $(ADLC_UPDATER) on each generated adlc file. It will selectively update changed or missing files.
-# 5) If we actually updated any files, echo a notice.
-#
-refresh_adfiles: $(EXEC) $(SOURCE.AD) $(ADLC_UPDATER)
-	@rm -rf $(TEMPDIR); mkdir $(TEMPDIR)
-	$(QUIETLY) $(EXEC) $(ADLCFLAGS) $(SOURCE.AD) \
-            -c$(TEMPDIR)/ad_$(Platform_arch_model).cpp -h$(TEMPDIR)/ad_$(Platform_arch_model).hpp -a$(TEMPDIR)/dfa_$(Platform_arch_model).cpp -v$(TEMPDIR)/adGlobals_$(Platform_arch_model).hpp \
-	    || { rm -rf $(TEMPDIR); exit 1; }
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model).hpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model)_clone.cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model)_expand.cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model)_format.cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model)_gen.cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model)_misc.cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model)_peephole.cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) ad_$(Platform_arch_model)_pipeline.cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) adGlobals_$(Platform_arch_model).hpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) ./$(ADLC_UPDATER) dfa_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR)
-	$(QUIETLY) [ -f $(TEMPDIR)/made-change ] \
-		|| echo "Rescanned $(SOURCE.AD) but encountered no changes."
-	$(QUIETLY) rm -rf $(TEMPDIR)
-
-
-# #########################################################################
-
-$(SOURCE.AD): $(SOURCES.AD)
-	$(QUIETLY) $(PROCESS_AD_FILES) $(SOURCES.AD) > $(SOURCE.AD)
-
-#PROCESS_AD_FILES = cat
-# Pass through #line directives, in case user enables -g option above:
-PROCESS_AD_FILES = awk '{ \
-    if (CUR_FN != FILENAME) { CUR_FN=FILENAME; NR_BASE=NR-1; need_lineno=1 } \
-    if (need_lineno && $$0 !~ /\/\//) \
-      { print "\n\n\#line " (NR-NR_BASE) " \"" FILENAME "\""; need_lineno=0 }; \
-    print }'
-
-$(OUTDIR)/%.o: %.cpp
-	@echo Compiling $<
-	$(QUIETLY) $(REMOVE_TARGET)
-	$(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
-
-# Some object files are given a prefix, to disambiguate
-# them from objects of the same name built for the VM.
-$(OUTDIR)/adlc-%.o: %.cpp
-	@echo Compiling $<
-	$(QUIETLY) $(REMOVE_TARGET)
-	$(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
-
-# #########################################################################
-
-clean:
-	rm $(OBJECTS)
-
-cleanall:
-	rm $(OBJECTS) $(EXEC)
-
-# #########################################################################
-
-.PHONY: all dump refresh_adfiles clean cleanall
--- a/make/aix/makefiles/build_vm_def.sh	Tue Apr 01 14:09:03 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# If we're cross compiling use that path for nm
-if [ "$CROSS_COMPILE_ARCH" != "" ]; then 
-NM=$ALT_COMPILER_PATH/nm
-else
-# On AIX we have to prevent that we pick up the 'nm' version from the GNU binutils
-# which may be installed under /opt/freeware/bin. So better use an absolute path here! 
-NM=/usr/bin/nm
-fi
-
-$NM -X64 -B -C $* \
-    | awk '{
-              if (($2="d" || $2="D") && ($3 ~ /^__vft/ || $3 ~ /^gHotSpotVM/)) print "\t" $3 ";"
-              if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
-              if ($3 ~ /^SharedArchivePath__9Arguments$/) print "\t" $3 ";"
-          }' \
-    | sort -u
--- a/make/aix/makefiles/buildtree.make	Tue Apr 01 14:09:03 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,364 +0,0 @@
-#
-# Copyright (c) 2005, 2013, 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.
-#
-#
-
-# Usage:
-#
-# $(MAKE) -f buildtree.make SRCARCH=srcarch BUILDARCH=buildarch LIBARCH=libarch
-#         GAMMADIR=dir OS_FAMILY=os VARIANT=variant
-#
-# The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the
-# environment or on the command-line:
-#
-# ARCH		- sparc, i486, ... HotSpot cpu and os_cpu source directory
-# BUILDARCH     - build directory
-# LIBARCH       - the corresponding directory in JDK/JRE
-# GAMMADIR	- top of workspace
-# OS_FAMILY	- operating system
-# VARIANT	- core, compiler1, compiler2, or tiered
-# HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
-# HOTSPOT_BUILD_VERSION   - internal, internal-$(USER_RELEASE_SUFFIX) or empty
-# JRE_RELEASE_VERSION     - <major>.<minor>.<micro> (1.7.0)
-#
-# Builds the directory trees with makefiles plus some convenience files in
-# each directory:
-#
-# Makefile	- for "make foo"
-# flags.make	- with macro settings
-# vm.make	- to support making "$(MAKE) -v vm.make" in makefiles
-# adlc.make	-
-# trace.make	- generate tracing event and type definitions
-# jvmti.make	- generate JVMTI bindings from the spec (JSR-163)
-# sa.make	- generate SA jar file and natives
-#
-# The makefiles are split this way so that "make foo" will run faster by not
-# having to read the dependency files for the vm.
-
--include $(SPEC)
-include $(GAMMADIR)/make/scm.make
-include $(GAMMADIR)/make/defs.make
-include $(GAMMADIR)/make/altsrc.make
-
-
-# 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details.
-QUIETLY$(MAKE_VERBOSE)	= @
-
-ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
-  PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
-else
-  ifdef USE_SUNCC
-    PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
-  else
-    PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
-  endif
-endif
-
-# Allow overriding of the arch part of the directory but default
-# to BUILDARCH if nothing is specified
-ifeq ($(VARIANTARCH),)
-  VARIANTARCH=$(BUILDARCH)
-endif
-
-ifdef FORCE_TIERED
-ifeq		($(VARIANT),tiered)
-PLATFORM_DIR	= $(OS_FAMILY)_$(VARIANTARCH)_compiler2
-else
-PLATFORM_DIR	= $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
-endif
-else
-PLATFORM_DIR    = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
-endif
-
-#
-# We do two levels of exclusion in the shared directory.
-# TOPLEVEL excludes are pruned, they are not recursively searched,
-# but lower level directories can be named without fear of collision.
-# ALWAYS excludes are excluded at any level in the directory tree.
-#
-
-ALWAYS_EXCLUDE_DIRS     = $(SCM_DIRS)
-
-ifeq		($(VARIANT),tiered)
-TOPLEVEL_EXCLUDE_DIRS	= $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name agent
-else
-ifeq		($(VARIANT),compiler2)
-TOPLEVEL_EXCLUDE_DIRS	= $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -