hg: amber/amber: manual merge

paul.sandoz at oracle.com paul.sandoz at oracle.com
Fri Jan 12 01:46:56 UTC 2018


Changeset: 172d4ab0f6ad
Author:    psandoz
Date:      2018-01-11 17:42 -0800
URL:       http://hg.openjdk.java.net/amber/amber/rev/172d4ab0f6ad

manual merge

! make/Images.gmk
! make/autoconf/boot-jdk.m4
! make/autoconf/bootcycle-spec.gmk.in
! make/autoconf/generated-configure.sh
! make/autoconf/spec.gmk.in
! make/common/JavaCompilation.gmk
- make/langtools/intellij/runConfigurations/javah.xml
- make/langtools/test/bootstrap/javah.sh
- make/langtools/test/lib/javah.sh
! make/test/JtregNativeHotspot.gmk
! src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java
- test/jdk/java/net/httpclient/RequestProcessorExceptions.java
- test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java
- test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out



More information about the amber-dev mailing list