hg: amber/amber: manual merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 6310392f2c03
Author:    mcimadamore
Date:      2018-04-10 17:39 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/6310392f2c03

manual merge with default

- make/data/x11wrappergen/functions.txt
- make/data/x11wrappergen/sizes.32
- make/data/x11wrappergen/sizes.64
- make/data/x11wrappergen/sizes.64-solaris-i386
- make/devkit/createSolarisDevkit.sh
- make/hotspot/src/native/dtrace/generateJvmOffsetsMain.c
- make/lib/LibosxLibraries.gmk
- make/lib/NetworkingLibraries.gmk
- make/lib/NioLibraries.gmk
- make/lib/PlatformLibraries.gmk
- make/lib/SecurityLibraries.gmk
- src/hotspot/share/gc/parallel/cardTableExtension.cpp
- src/hotspot/share/gc/parallel/cardTableExtension.hpp
- src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.cpp
- src/hotspot/share/logging/logTagLevelExpression.cpp
- src/hotspot/share/logging/logTagLevelExpression.hpp
- src/hotspot/share/memory/universe_ext.cpp
- src/hotspot/share/services/allocationContextService.hpp
- src/java.base/share/classes/javax/security/auth/Policy.java
- src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
- src/java.base/unix/classes/java/io/FileDescriptor.java
- src/java.base/windows/classes/java/io/FileDescriptor.java
- src/java.management/share/classes/sun/management/TypeVersionMapper.java
- src/java.sql/share/classes/javax/transaction/xa/XAException.java
- src/java.sql/share/classes/javax/transaction/xa/XAResource.java
- src/java.sql/share/classes/javax/transaction/xa/Xid.java
- src/java.sql/share/classes/javax/transaction/xa/package.html
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/hotspot/gtest/logging/test_logTagLevelExpression.cpp
- test/jdk/com/sun/jdi/JDIScaffold.java
- test/jdk/java/lang/System/ExitFinalizersAndJIT.java
- test/jdk/java/lang/System/finalization/FinExit.java
- test/jdk/java/lang/System/finalization/FinExit.sh
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so
- test/jdk/javax/transaction/testng/Driver.java
- test/jdk/javax/transaction/testng/test/transaction/XAExceptionTests.java
- test/jdk/javax/transaction/testng/util/SerializedTransactionExceptions.java
- test/jdk/sanity/releaseFile/NegativeSOURCETest.java
- test/jdk/sun/java2d/OpenGL/CopyAreaOOB.java
- test/jdk/sun/java2d/OpenGL/CustomCompositeTest.java
- test/jdk/sun/java2d/OpenGL/DrawBufImgOp.java
- test/jdk/sun/java2d/OpenGL/DrawHugeImageTest.java
- test/jdk/sun/java2d/OpenGL/GradientPaints.java
- test/jdk/sun/java2d/OpenGL/bug7181438.java
! test/langtools/tools/javac/lambda/LambdaParserTest.java