hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Fri Apr 13 17:43:42 UTC 2018


Changeset: 247580edbf9d
Author:    vromero
Date:      2018-04-13 13:43 -0400
URL:       http://hg.openjdk.java.net/amber/amber/rev/247580edbf9d

manual merge with default

! make/CreateJmods.gmk
! make/Init.gmk
! make/InitSupport.gmk
! make/autoconf/basics.m4
! make/autoconf/help.m4
! make/autoconf/spec.gmk.in
! make/common/NativeCompilation.gmk
! make/mapfiles/libjsig/mapfile-vers-solaris
- src/java.base/linux/native/libjsig/jsig.c
- src/java.base/macosx/native/libjsig/jsig.c
! src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
! src/java.base/share/classes/java/lang/invoke/package-info.java
- src/java.base/share/classes/java/time/format/ZoneName.java
- src/java.base/solaris/native/libjsig/jsig.c
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Pool.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
! test/langtools/tools/javac/diags/examples.not-yet.txt



More information about the amber-dev mailing list