hg: amber/amber: manual merge

[paul.sandoz at oracle.com]

Changeset: e0dd37fa786d
Author:    psandoz
Date:      2017-11-06 15:59 -0800
URL:       http://hg.openjdk.java.net/amber/amber/rev/e0dd37fa786d

manual merge

! make/autoconf/flags.m4
! make/autoconf/generated-configure.sh
! make/autoconf/help.m4
! make/autoconf/jdk-options.m4
! make/autoconf/spec.gmk.in
! make/copy/Copy-java.base.gmk
- make/data/symbols/java.activation-6.sym.txt
- make/data/symbols/java.activation-7.sym.txt
- make/data/symbols/java.annotations.common-6.sym.txt
- make/data/symbols/java.annotations.common-7.sym.txt
- make/data/symbols/java.annotations.common-8.sym.txt
- make/data/symbols/java.corba-6.sym.txt
- make/data/symbols/java.corba-7.sym.txt
- make/data/symbols/java.datatransfer-6.sym.txt
- make/data/symbols/java.instrument-6.sym.txt
- make/data/symbols/java.instrument-7.sym.txt
- make/data/symbols/java.naming-6.sym.txt
- make/data/symbols/java.prefs-6.sym.txt
- make/data/symbols/java.scripting-6.sym.txt
- make/data/symbols/java.security.sasl-6.sym.txt
- make/data/symbols/java.transaction-6.sym.txt
- make/data/symbols/java.transaction-7.sym.txt
- make/data/symbols/java.xml.crypto-6.sym.txt
- make/data/symbols/java.xml.crypto-7.sym.txt
- make/data/symbols/java.xml.ws-7.sym.txt
- make/data/symbols/jdk.httpserver-6.sym.txt
- make/data/symbols/jdk.scripting.nashorn-6.sym.txt
- make/data/symbols/jdk.security.auth-6.sym.txt
! make/hotspot/ide/CreateVSProject.gmk
! make/test/JtregNativeHotspot.gmk
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
- src/hotspot/cpu/zero/sharkFrame_zero.hpp
- src/hotspot/cpu/zero/shark_globals_zero.hpp
- src/hotspot/os/windows/decoder_windows.hpp
! src/hotspot/share/ci/ciEnv.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.hpp
- src/hotspot/share/code/jvmticmlr.h
- src/hotspot/share/gc/g1/suspendibleThreadSet.cpp
- src/hotspot/share/gc/g1/suspendibleThreadSet.hpp
! src/hotspot/share/interpreter/bytecodeInterpreter.cpp
! src/hotspot/share/interpreter/linkResolver.cpp
! src/hotspot/share/jvmci/vmStructs_jvmci.cpp
! src/hotspot/share/memory/universe.cpp
! src/hotspot/share/oops/constantPool.cpp
! src/hotspot/share/oops/constantPool.hpp
- src/hotspot/share/prims/jni.h
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/prims/jvm.h
! src/hotspot/share/prims/jvmtiRedefineClasses.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/hotspot/share/shark/llvmHeaders.hpp
- src/hotspot/share/shark/llvmValue.hpp
- src/hotspot/share/shark/sharkBlock.cpp
- src/hotspot/share/shark/sharkBlock.hpp
- src/hotspot/share/shark/sharkBuilder.cpp
- src/hotspot/share/shark/sharkBuilder.hpp
- src/hotspot/share/shark/sharkCacheDecache.cpp
- src/hotspot/share/shark/sharkCacheDecache.hpp
- src/hotspot/share/shark/sharkCodeBuffer.hpp
- src/hotspot/share/shark/sharkCompiler.cpp
- src/hotspot/share/shark/sharkCompiler.hpp
- src/hotspot/share/shark/sharkConstant.cpp
- src/hotspot/share/shark/sharkConstant.hpp
- src/hotspot/share/shark/sharkContext.cpp
- src/hotspot/share/shark/sharkContext.hpp
- src/hotspot/share/shark/sharkEntry.hpp
- src/hotspot/share/shark/sharkFunction.cpp
- src/hotspot/share/shark/sharkFunction.hpp
- src/hotspot/share/shark/sharkInliner.cpp
- src/hotspot/share/shark/sharkInliner.hpp
- src/hotspot/share/shark/sharkIntrinsics.cpp
- src/hotspot/share/shark/sharkIntrinsics.hpp
- src/hotspot/share/shark/sharkInvariants.cpp
- src/hotspot/share/shark/sharkInvariants.hpp
- src/hotspot/share/shark/sharkMemoryManager.cpp
- src/hotspot/share/shark/sharkMemoryManager.hpp
- src/hotspot/share/shark/sharkNativeWrapper.cpp
- src/hotspot/share/shark/sharkNativeWrapper.hpp
- src/hotspot/share/shark/sharkRuntime.cpp
- src/hotspot/share/shark/sharkRuntime.hpp
- src/hotspot/share/shark/sharkStack.cpp
- src/hotspot/share/shark/sharkStack.hpp
- src/hotspot/share/shark/sharkState.cpp
- src/hotspot/share/shark/sharkState.hpp
- src/hotspot/share/shark/sharkStateScanner.cpp
- src/hotspot/share/shark/sharkStateScanner.hpp
- src/hotspot/share/shark/sharkTopLevelBlock.cpp
- src/hotspot/share/shark/sharkTopLevelBlock.hpp
- src/hotspot/share/shark/sharkType.hpp
- src/hotspot/share/shark/sharkValue.cpp
- src/hotspot/share/shark/sharkValue.hpp
- src/hotspot/share/shark/shark_globals.cpp
- src/hotspot/share/shark/shark_globals.hpp
! src/hotspot/share/utilities/exceptions.cpp
- src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
- src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat
- src/java.desktop/unix/legal/fontconfig.md
- src/java.desktop/unix/native/common/awt/fontconfig.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Constants.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Generator.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Main.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/Resources.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java
- test/jdk/com/sun/awt/Translucency/WindowOpacity.java
- test/jdk/javax/swing/JTextPane/bug8025082.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/Agent.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServer.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/Apple.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUser.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/Callback.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/CountInterface.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/G1.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/G1Impl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObject.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/Orange.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/Server.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/Task.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/TestInterface.java
- test/jdk/sun/rmi/rmic/newrmic/equivalence/batch.sh
- test/jdk/sun/rmi/rmic/newrmic/equivalence/run.sh