changeset 39196:1973d0318492

Merge
author jmasa
date Fri, 10 Jun 2016 15:03:10 -0700
parents 8aa38604bd2b 7f9e6818a957
children 426e5fc960d0
files hotspot/make/Makefile hotspot/make/aix/Makefile hotspot/make/aix/adlc_updater hotspot/make/aix/makefiles/adjust-mflags.sh hotspot/make/aix/makefiles/adlc.make hotspot/make/aix/makefiles/build_vm_def.sh hotspot/make/aix/makefiles/buildtree.make hotspot/make/aix/makefiles/compiler2.make hotspot/make/aix/makefiles/core.make hotspot/make/aix/makefiles/debug.make hotspot/make/aix/makefiles/defs.make hotspot/make/aix/makefiles/dtrace.make hotspot/make/aix/makefiles/fastdebug.make hotspot/make/aix/makefiles/jsig.make hotspot/make/aix/makefiles/jvmti.make hotspot/make/aix/makefiles/mapfile-vers-debug hotspot/make/aix/makefiles/mapfile-vers-jsig hotspot/make/aix/makefiles/mapfile-vers-product hotspot/make/aix/makefiles/ppc64.make hotspot/make/aix/makefiles/product.make hotspot/make/aix/makefiles/rules.make hotspot/make/aix/makefiles/tiered.make hotspot/make/aix/makefiles/top.make hotspot/make/aix/makefiles/trace.make hotspot/make/aix/makefiles/vm.make hotspot/make/aix/makefiles/xlc.make hotspot/make/aix/platform_ppc64 hotspot/make/altsrc.make hotspot/make/bsd/Makefile hotspot/make/bsd/README hotspot/make/bsd/adlc_updater hotspot/make/bsd/makefiles/adjust-mflags.sh hotspot/make/bsd/makefiles/adlc.make hotspot/make/bsd/makefiles/amd64.make hotspot/make/bsd/makefiles/arm.make hotspot/make/bsd/makefiles/build_vm_def.sh hotspot/make/bsd/makefiles/buildtree.make hotspot/make/bsd/makefiles/compiler1.make hotspot/make/bsd/makefiles/compiler2.make hotspot/make/bsd/makefiles/core.make hotspot/make/bsd/makefiles/cscope.make hotspot/make/bsd/makefiles/debug.make hotspot/make/bsd/makefiles/defs.make hotspot/make/bsd/makefiles/dtrace.make hotspot/make/bsd/makefiles/fastdebug.make hotspot/make/bsd/makefiles/gcc.make hotspot/make/bsd/makefiles/hp.make hotspot/make/bsd/makefiles/hp1.make hotspot/make/bsd/makefiles/i486.make hotspot/make/bsd/makefiles/ia64.make hotspot/make/bsd/makefiles/jsig.make hotspot/make/bsd/makefiles/jvmti.make hotspot/make/bsd/makefiles/mapfile-vers-darwin-debug hotspot/make/bsd/makefiles/mapfile-vers-darwin-product hotspot/make/bsd/makefiles/mapfile-vers-debug hotspot/make/bsd/makefiles/mapfile-vers-jsig hotspot/make/bsd/makefiles/mapfile-vers-product hotspot/make/bsd/makefiles/minimal1.make hotspot/make/bsd/makefiles/optimized.make hotspot/make/bsd/makefiles/ppc.make hotspot/make/bsd/makefiles/product.make hotspot/make/bsd/makefiles/rules.make hotspot/make/bsd/makefiles/shark.make hotspot/make/bsd/makefiles/sparc.make hotspot/make/bsd/makefiles/sparcWorks.make hotspot/make/bsd/makefiles/sparcv9.make hotspot/make/bsd/makefiles/tiered.make hotspot/make/bsd/makefiles/top.make hotspot/make/bsd/makefiles/trace.make hotspot/make/bsd/makefiles/universal.gmk hotspot/make/bsd/makefiles/vm.make hotspot/make/bsd/makefiles/zero.make hotspot/make/bsd/makefiles/zeroshark.make hotspot/make/bsd/platform_amd64 hotspot/make/bsd/platform_amd64.suncc hotspot/make/bsd/platform_i486 hotspot/make/bsd/platform_i486.suncc hotspot/make/bsd/platform_ia64 hotspot/make/bsd/platform_sparc hotspot/make/bsd/platform_sparcv9 hotspot/make/bsd/platform_zero.in hotspot/make/build.sh hotspot/make/cscope.make hotspot/make/defs.make hotspot/make/excludeSrc.make hotspot/make/hotspot_distro hotspot/make/jdk_version hotspot/make/jprt.gmk hotspot/make/linux/Makefile hotspot/make/linux/README hotspot/make/linux/adlc_updater hotspot/make/linux/makefiles/aarch64.make hotspot/make/linux/makefiles/adjust-mflags.sh hotspot/make/linux/makefiles/adlc.make hotspot/make/linux/makefiles/amd64.make hotspot/make/linux/makefiles/buildtree.make hotspot/make/linux/makefiles/compiler1.make hotspot/make/linux/makefiles/compiler2.make hotspot/make/linux/makefiles/core.make hotspot/make/linux/makefiles/debug.make hotspot/make/linux/makefiles/defs.make hotspot/make/linux/makefiles/dtrace.make hotspot/make/linux/makefiles/fastdebug.make hotspot/make/linux/makefiles/gcc.make hotspot/make/linux/makefiles/hp.make hotspot/make/linux/makefiles/hp1.make hotspot/make/linux/makefiles/i486.make hotspot/make/linux/makefiles/ia64.make hotspot/make/linux/makefiles/jsig.make hotspot/make/linux/makefiles/jvmti.make hotspot/make/linux/makefiles/mapfile-vers-debug hotspot/make/linux/makefiles/mapfile-vers-jsig hotspot/make/linux/makefiles/mapfile-vers-product hotspot/make/linux/makefiles/minimal1.make hotspot/make/linux/makefiles/optimized.make hotspot/make/linux/makefiles/ppc64.make hotspot/make/linux/makefiles/product.make hotspot/make/linux/makefiles/rules.make hotspot/make/linux/makefiles/shark.make hotspot/make/linux/makefiles/sparc.make hotspot/make/linux/makefiles/sparcWorks.make hotspot/make/linux/makefiles/sparcv9.make hotspot/make/linux/makefiles/tiered.make hotspot/make/linux/makefiles/top.make hotspot/make/linux/makefiles/trace.make hotspot/make/linux/makefiles/vm.make hotspot/make/linux/makefiles/zero.make hotspot/make/linux/makefiles/zeroshark.make hotspot/make/linux/platform_aarch64 hotspot/make/linux/platform_amd64 hotspot/make/linux/platform_amd64.suncc hotspot/make/linux/platform_i486 hotspot/make/linux/platform_i486.suncc hotspot/make/linux/platform_ia64 hotspot/make/linux/platform_ppc64 hotspot/make/linux/platform_sparc hotspot/make/linux/platform_sparcv9 hotspot/make/linux/platform_zero.in hotspot/make/openjdk_distro hotspot/make/pic.make hotspot/make/scm.make hotspot/make/share/makefiles/mapfile-vers hotspot/make/solaris/Makefile hotspot/make/solaris/adlc_updater hotspot/make/solaris/makefiles/adjust-mflags.sh hotspot/make/solaris/makefiles/adlc.make hotspot/make/solaris/makefiles/amd64.make hotspot/make/solaris/makefiles/build_vm_def.sh hotspot/make/solaris/makefiles/buildtree.make hotspot/make/solaris/makefiles/compiler1.make hotspot/make/solaris/makefiles/compiler2.make hotspot/make/solaris/makefiles/core.make hotspot/make/solaris/makefiles/debug.make hotspot/make/solaris/makefiles/defs.make hotspot/make/solaris/makefiles/dtrace.make hotspot/make/solaris/makefiles/fastdebug.make hotspot/make/solaris/makefiles/gcc.make hotspot/make/solaris/makefiles/hp.make hotspot/make/solaris/makefiles/hp1.make hotspot/make/solaris/makefiles/i486.make hotspot/make/solaris/makefiles/jsig.make hotspot/make/solaris/makefiles/jvmti.make hotspot/make/solaris/makefiles/mapfile-vers hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1 hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2 hotspot/make/solaris/makefiles/mapfile-vers-CORE hotspot/make/solaris/makefiles/mapfile-vers-TIERED hotspot/make/solaris/makefiles/mapfile-vers-debug hotspot/make/solaris/makefiles/mapfile-vers-jsig hotspot/make/solaris/makefiles/mapfile-vers-jvm_db hotspot/make/solaris/makefiles/mapfile-vers-jvm_dtrace hotspot/make/solaris/makefiles/optimized.make hotspot/make/solaris/makefiles/product.make hotspot/make/solaris/makefiles/reorder_CORE_amd64 hotspot/make/solaris/makefiles/rules.make hotspot/make/solaris/makefiles/sparc.make hotspot/make/solaris/makefiles/sparcWorks.make hotspot/make/solaris/makefiles/sparcv9.make hotspot/make/solaris/makefiles/tiered.make hotspot/make/solaris/makefiles/top.make hotspot/make/solaris/makefiles/trace.make hotspot/make/solaris/makefiles/vm.make hotspot/make/solaris/platform_amd64 hotspot/make/solaris/platform_amd64.gcc hotspot/make/solaris/platform_i486 hotspot/make/solaris/platform_i486.gcc hotspot/make/solaris/platform_sparc hotspot/make/solaris/platform_sparc.gcc hotspot/make/solaris/platform_sparcv9 hotspot/make/solaris/platform_sparcv9.gcc hotspot/make/windows/build.bat hotspot/make/windows/build.make hotspot/make/windows/build_vm_def.sh hotspot/make/windows/create.bat hotspot/make/windows/create_obj_files.sh hotspot/make/windows/cross_build.bat hotspot/make/windows/get_msc_ver.sh hotspot/make/windows/jvmexp.lcf hotspot/make/windows/jvmexp_g.lcf hotspot/make/windows/makefiles/adlc.make hotspot/make/windows/makefiles/compile.make hotspot/make/windows/makefiles/debug.make hotspot/make/windows/makefiles/defs.make hotspot/make/windows/makefiles/fastdebug.make hotspot/make/windows/makefiles/generated.make hotspot/make/windows/makefiles/jvmti.make hotspot/make/windows/makefiles/product.make hotspot/make/windows/makefiles/projectcreator.make hotspot/make/windows/makefiles/rules.make hotspot/make/windows/makefiles/sanity.make hotspot/make/windows/makefiles/shared.make hotspot/make/windows/makefiles/top.make hotspot/make/windows/makefiles/trace.make hotspot/make/windows/makefiles/vm.make hotspot/make/windows/projectfiles/common/Makefile hotspot/make/windows/projectfiles/compiler1/Makefile hotspot/make/windows/projectfiles/compiler1/vm.def hotspot/make/windows/projectfiles/compiler1/vm.dsw hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsp hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsw hotspot/make/windows/projectfiles/compiler2/Makefile hotspot/make/windows/projectfiles/compiler2/vm.def hotspot/make/windows/projectfiles/compiler2/vm.dsw hotspot/make/windows/projectfiles/core/Makefile hotspot/make/windows/projectfiles/core/vm.def hotspot/make/windows/projectfiles/core/vm.dsw hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsp hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsw hotspot/make/windows/projectfiles/tiered/Makefile hotspot/make/windows/projectfiles/tiered/vm.def hotspot/make/windows/projectfiles/tiered/vm.dsw hotspot/makefiles/BuildHotspot.gmk hotspot/makefiles/Dist.gmk hotspot/makefiles/HotspotCommon.gmk hotspot/makefiles/gensrc/GenerateSources.gmk hotspot/makefiles/gensrc/GensrcAdlc.gmk hotspot/makefiles/gensrc/GensrcDtrace.gmk hotspot/makefiles/gensrc/GensrcJvmti.gmk hotspot/makefiles/ide/CreateVSProject.gmk hotspot/makefiles/lib/CompileDtracePostJvm.gmk hotspot/makefiles/lib/CompileDtracePreJvm.gmk hotspot/makefiles/lib/CompileJvm.gmk hotspot/makefiles/lib/CompileLibjsig.gmk hotspot/makefiles/lib/CompileLibraries.gmk hotspot/makefiles/lib/JvmFeatures.gmk hotspot/makefiles/lib/JvmMapfile.gmk hotspot/makefiles/lib/JvmOverrideFiles.gmk hotspot/makefiles/mapfiles/libjsig/mapfile-vers-solaris hotspot/makefiles/mapfiles/libjvm_db/mapfile-vers hotspot/makefiles/mapfiles/libjvm_dtrace/mapfile-vers hotspot/makefiles/symbols/symbols-aix hotspot/makefiles/symbols/symbols-aix-debug hotspot/makefiles/symbols/symbols-linux hotspot/makefiles/symbols/symbols-macosx hotspot/makefiles/symbols/symbols-shared hotspot/makefiles/symbols/symbols-solaris hotspot/makefiles/symbols/symbols-solaris-dtrace-compiler1 hotspot/makefiles/symbols/symbols-solaris-dtrace-compiler2 hotspot/makefiles/symbols/symbols-unix hotspot/src/cpu/x86/vm/macroAssembler_libm_x86_32.cpp hotspot/src/cpu/x86/vm/macroAssembler_libm_x86_64.cpp hotspot/src/share/tools/ProjectCreator/ArgsParser.java hotspot/src/share/tools/ProjectCreator/BuildConfig.java hotspot/src/share/tools/ProjectCreator/FileTreeCreator.java hotspot/src/share/tools/ProjectCreator/FileTreeCreatorVC10.java hotspot/src/share/tools/ProjectCreator/ProjectCreator.java hotspot/src/share/tools/ProjectCreator/Util.java hotspot/src/share/tools/ProjectCreator/WinGammaPlatform.java hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java hotspot/src/share/vm/gc/g1/youngList.cpp hotspot/src/share/vm/gc/g1/youngList.hpp hotspot/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp hotspot/src/share/vm/utilities/array.cpp hotspot/test/compiler/jvmci/code/CodeInstallationTest.java hotspot/test/compiler/jvmci/code/DataPatchTest.java hotspot/test/compiler/jvmci/code/DebugInfoTest.java hotspot/test/compiler/jvmci/code/InterpreterFrameSizeTest.java hotspot/test/compiler/jvmci/code/SimpleCodeInstallationTest.java hotspot/test/compiler/jvmci/code/SimpleDebugInfoTest.java hotspot/test/compiler/jvmci/code/TestAssembler.java hotspot/test/compiler/jvmci/code/VirtualObjectDebugInfoTest.java hotspot/test/compiler/jvmci/code/amd64/AMD64TestAssembler.java hotspot/test/compiler/jvmci/code/sparc/SPARCTestAssembler.java hotspot/test/compiler/unsafe/generate-unsafe-tests.sh hotspot/test/runtime/8003720/Asmator.java hotspot/test/runtime/8003720/Test8003720.java hotspot/test/runtime/8003720/Victim.java hotspot/test/runtime/8003720/VictimClassLoader.java hotspot/test/runtime/SharedArchiveFile/BasicJarBuilder.java hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/TypeUtil.java hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java jdk/src/java.base/share/classes/jdk/Version.java jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.c jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.c jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_f.c jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.c jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_34.c jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_16nw.c jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvIndex3_8_8nw.c jdk/src/java.httpclient/share/classes/java/net/http/HttpHeaders1.java jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProvider.java jdk/src/jdk.jcmd/share/classes/jdk/internal/vm/agent/spi/ToolProviderFinder.java jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PluginContextImpl.java jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PoolImpl.java jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/PluginContext.java jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/Pool.java jdk/src/jdk.unsupported/share/classes/sun/misc/SoftCache.java jdk/src/jdk.unsupported/unix/classes/sun/misc/GThreadHelper.java jdk/test/java/awt/dnd/Button2DragTest/Button2DragTest.html jdk/test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.html jdk/test/java/util/ResourceBundle/RestrictedBundleTest.html jdk/test/java/util/ResourceBundle/RestrictedBundleTest.java jdk/test/javax/sound/sampled/spi/AudioFileReader/RecognizeHugeWaveFloatFiles.java jdk/test/javax/xml/bind/xjc/8032884/compile-schema.sh jdk/test/jdk/Version/Basic.java jdk/test/jdk/modules/scenarios/overlappingpackages/src/misc/sun/misc/Unsafe.java jdk/test/sun/tools/jinfo/JInfoHelper.java jdk/test/sun/tools/jinfo/JInfoLauncherTest.java jdk/test/sun/tools/jinfo/JInfoRunningProcessFlagTest.java jdk/test/sun/tools/jinfo/JInfoRunningProcessTest.java jdk/test/sun/tools/jinfo/JInfoSanityTest.java jdk/test/sun/tools/jmap/heapconfig/JMapHeapConfigTest.java jdk/test/sun/tools/jmap/heapconfig/TmtoolTestScenario.java jdk/test/tools/launcher/modules/patch/PatchTest.java jdk/test/tools/launcher/modules/patch/src/test/jdk/test/Main.java jdk/test/tools/launcher/modules/patch/src/test/module-info.java jdk/test/tools/launcher/modules/patch/src1/java.base/java/text/Annotation.java jdk/test/tools/launcher/modules/patch/src1/java.base/java/text/AnnotationBuddy.java jdk/test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/Main.java jdk/test/tools/launcher/modules/patch/src1/jdk.compiler/com/sun/tools/javac/MainBuddy.java jdk/test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClient.java jdk/test/tools/launcher/modules/patch/src1/jdk.naming.dns/com/sun/jndi/dns/DnsClientBuddy.java jdk/test/tools/launcher/modules/patch/src2/java.base/java/lang2/Object.java jdk/test/tools/launcher/modules/patch/src2/jdk.compiler/com/sun/tools/javac2/Main.java jdk/test/tools/launcher/modules/patch/src2/jdk.naming.dns/com/sun/jndi/dns2/Zone.java langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleWrappers.java langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulePaths.java langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteResolutionException.java langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/EditingHistory.java langtools/src/jdk.jshell/share/classes/jdk/jshell/ClassTracker.java langtools/src/jdk.jshell/share/classes/jdk/jshell/ExecutionControl.java langtools/src/jdk.jshell/share/classes/jdk/jshell/JDIConnection.java langtools/src/jdk.jshell/share/classes/jdk/jshell/JDIEnv.java langtools/src/jdk.jshell/share/classes/jdk/jshell/JDIEventHandler.java langtools/src/jdk.jshell/share/classes/jdk/jshell/JDINotConnectedException.java langtools/test/tools/jdeps/CompilerUtils.java nashorn/test/script/nosecurity/JDK-8144221.js nashorn/test/script/nosecurity/JDK-8144221.js.EXPECTED test/lib/sun/hotspot/WhiteBox.java
diffstat 3050 files changed, 123147 insertions(+), 105719 deletions(-) [+]