hg: amber/amber: manual merge

[paul.sandoz at oracle.com]

Changeset: f5d98c9f3e6c
Author:    psandoz
Date:      2017-11-16 17:58 -0800
URL:       http://hg.openjdk.java.net/amber/amber/rev/f5d98c9f3e6c

manual merge

! make/CreateJmods.gmk
! make/autoconf/spec.gmk.in
! make/common/MakeBase.gmk
! make/copy/Copy-java.base.gmk
- make/mapfiles/libextnet/mapfile-vers
! make/test/JtregNativeHotspot.gmk
- src/hotspot/.mx.jvmci/.project
- src/hotspot/.mx.jvmci/.pydevproject
- src/hotspot/cpu/aarch64/jni_aarch64.h
- src/hotspot/cpu/arm/jni_arm.h
- src/hotspot/cpu/ppc/jni_ppc.h
- src/hotspot/cpu/s390/jni_s390.h
- src/hotspot/cpu/sparc/jni_sparc.h
- src/hotspot/cpu/x86/jni_x86.h
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
- src/hotspot/cpu/zero/jni_zero.h
- src/hotspot/os/aix/jvm_aix.h
- src/hotspot/os/bsd/jvm_bsd.h
- src/hotspot/os/linux/jvm_linux.h
- src/hotspot/os/solaris/jvm_solaris.h
- src/hotspot/os/windows/jvm_windows.h
! src/hotspot/share/ci/ciEnv.cpp
! src/hotspot/share/ci/ciReplay.cpp
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/verifier.cpp
! src/hotspot/share/classfile/vmSymbols.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/gc/g1/concurrentG1Refine.cpp
- src/hotspot/share/gc/g1/concurrentG1Refine.hpp
- src/hotspot/share/gc/g1/concurrentG1RefineThread.cpp
- src/hotspot/share/gc/g1/concurrentG1RefineThread.hpp
! src/hotspot/share/interpreter/interpreterRuntime.cpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/generateOopMap.cpp
- src/hotspot/share/prims/jni_md.h
! src/hotspot/share/prims/jvm.cpp
- src/hotspot/share/prims/jvm.h
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/reflection.cpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/utilities/constantTag.hpp
- src/java.base/macosx/native/include/jni_md.h
- src/java.base/macosx/native/include/jvm_md.h
! src/java.base/share/native/include/classfile_constants.h
- src/java.desktop/share/classes/sun/java2d/pisces/Curve.java
- src/java.desktop/share/classes/sun/java2d/pisces/Dasher.java
- src/java.desktop/share/classes/sun/java2d/pisces/Helpers.java
- src/java.desktop/share/classes/sun/java2d/pisces/PiscesCache.java
- src/java.desktop/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
- src/java.desktop/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
- src/java.desktop/share/classes/sun/java2d/pisces/Renderer.java
- src/java.desktop/share/classes/sun/java2d/pisces/Stroker.java
- src/java.desktop/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java
- src/java.desktop/unix/classes/sun/java2d/jules/IdleTileCache.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesAATileGenerator.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesPathBuf.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesRenderingEngine.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java
- src/java.desktop/unix/classes/sun/java2d/jules/JulesTile.java
- src/java.desktop/unix/classes/sun/java2d/jules/TileTrapContainer.java
- src/java.desktop/unix/classes/sun/java2d/jules/TileWorker.java
- src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JNIid.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/overview.html
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/overview.html
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopySlowPathNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/ArrayCopyUnrollNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopyNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/UnsafeArrayCopySnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/DivNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BasicIdealGraphPrinter.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/IdealGraphPrinter.java
- src/jdk.jshell/share/classes/jdk/jshell/tool/resources/JAVASE.jsh
- test/hotspot/jtreg/applications/ctw/Modules.java
- test/jdk/sun/java2d/pisces/OpenJDKFillBug.java
- test/jdk/sun/java2d/pisces/Renderer/Test7019861.java
- test/jdk/sun/java2d/pisces/Renderer/TestNPE.java
- test/jdk/sun/java2d/pisces/Test7036754.java
- test/jdk/sun/pisces/DashStrokeTest.java
- test/jdk/sun/pisces/JoinMiterTest.java
- test/jdk/sun/pisces/ScaleTest.java
- test/jdk/sun/pisces/StrokeShapeTest.java
- test/jdk/sun/pisces/TEST.properties
- test/jdk/sun/pisces/ThinLineTest.java