hg: amber/amber/hotspot: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: 6101699810f1
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:37 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/6101699810f1

Automatic merge with constant-folding

- make/templates/gpl-cp-header
- make/templates/gpl-header
! src/share/vm/runtime/vmStructs.cpp