hg: jdk/sandbox: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: 31a56cf07dd4
Author:    ihse
Date:      2020-08-18 22:20 +0200
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/31a56cf07dd4

Merge

! make/UpdateX11Wrappers.gmk
! make/autoconf/configure.ac
! make/autoconf/flags-cflags.m4
! make/autoconf/flags-ldflags.m4
! make/autoconf/flags-other.m4
! make/autoconf/flags.m4
! make/autoconf/libraries.m4
! make/autoconf/spec.gmk.in
! make/common/NativeCompilation.gmk
! make/hotspot/gensrc/GensrcAdlc.gmk
! make/hotspot/gensrc/GensrcDtrace.gmk
- make/hotspot/lib/CompileDtraceLibraries.gmk
! make/hotspot/lib/CompileGtest.gmk
! make/hotspot/lib/CompileJvm.gmk
- make/hotspot/lib/JvmDtraceObjects.gmk
! make/hotspot/lib/JvmFlags.gmk
! make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java
! make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk < make/gensrc/GensrcX11Wrappers.gmk
! src/hotspot/os/linux/os_linux.cpp
- src/hotspot/os/solaris/dtrace/jhelper.d
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/opto/machnode.hpp
! src/hotspot/share/prims/jvm.cpp
! src/java.base/share/native/libjli/args.c
! src/java.base/share/native/libjli/java.c
! src/java.base/share/native/libjli/parse_manifest.c
! src/java.base/share/native/libnet/net_util.c
! src/java.base/share/native/libzip/zip_util.c
! src/java.base/unix/native/libjava/TimeZone_md.c
! src/java.base/unix/native/libjava/childproc.c
- src/java.base/unix/native/libjava/jdk_util_md.c
+ src/java.base/unix/native/libjli/java_md.c
! src/java.base/unix/native/libjli/java_md_common.c
- src/java.base/unix/native/libjli/java_md_solinux.c
! src/java.base/unix/native/libnet/DefaultProxySelector.c
! src/java.base/unix/native/libnet/PlainSocketImpl.c
! src/java.base/unix/native/libnet/net_util_md.c
! src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c
! src/java.desktop/share/native/common/java2d/opengl/OGLRenderQueue.c
! src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c
! src/java.desktop/share/native/libfontmanager/DrawGlyphList.c
! src/java.desktop/share/native/libfontmanager/sunFont.c
! src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c
! src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c
- src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_PCM.c
- src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
- src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
! src/java.desktop/unix/native/common/awt/X11Color.c
! src/java.desktop/unix/native/common/awt/fontpath.c
! src/java.desktop/unix/native/common/java2d/opengl/GLXGraphicsConfig.c
! src/java.desktop/unix/native/libawt/awt/awt_Mlib.c
! src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
! src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
! src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c
! src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
! src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
! src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c
! src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c
! src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
! src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c
! src/java.instrument/unix/native/libinstrument/FileSystemSupport_md.c
- src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeFunc.c
! src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
! src/jdk.jdwp.agent/share/native/libjdwp/eventHelper.c
! src/jdk.jdwp.agent/share/native/libjdwp/log_messages.c
! src/jdk.jdwp.agent/unix/native/libdt_socket/socket_md.c
- src/jdk.management/solaris/native/libmanagement_ext/UnixOperatingSystem.c