hg: amber/amber: manual merge with default branch

vicente.romero at oracle.com vicente.romero at oracle.com
Thu Dec 21 22:50:07 UTC 2017


Changeset: eedd12872b28
Author:    vromero
Date:      2017-12-21 17:45 -0500
URL:       http://hg.openjdk.java.net/amber/amber/rev/eedd12872b28

manual merge with default branch

! make/Main.gmk
! make/autoconf/buildjdk-spec.gmk.in
! make/autoconf/flags.m4
! make/autoconf/generated-configure.sh
! make/autoconf/spec.gmk.in
! make/copy/Copy-java.base.gmk
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/java.base/share/classes/java/util/ArraysSupport.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
- src/java.base/share/native/include/classfile_constants.h
+ src/java.base/share/native/include/classfile_constants.h.template
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.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/Target.java



More information about the amber-dev mailing list