changeset 49497:cb442a8273cb

Merge
author mikael
date Fri, 30 Mar 2018 21:19:21 -0700
parents d89c66395a1b f7363de371c9
children f7d3f7b5648f
files make/autoconf/hotspot.m4 make/autoconf/platform.m4 make/autoconf/spec.gmk.in make/conf/jib-profiles.js make/hotspot/lib/CompileJvm.gmk make/hotspot/lib/CompileLibjsig.gmk make/lib/CoreLibraries.gmk make/lib/Lib-jdk.hotspot.agent.gmk make/lib/SoundLibraries.gmk make/mapfiles/libattach/mapfile-aix make/mapfiles/libattach/mapfile-linux make/mapfiles/libattach/mapfile-solaris make/mapfiles/libattach/reorder-windows-x86 make/mapfiles/libattach/reorder-windows-x86_64 make/mapfiles/libawt/mapfile-mawt-vers make/mapfiles/libawt/mapfile-vers make/mapfiles/libawt/mapfile-vers-linux make/mapfiles/libawt_headless/mapfile-vers make/mapfiles/libawt_headless/reorder-sparc make/mapfiles/libawt_headless/reorder-sparcv9 make/mapfiles/libawt_headless/reorder-x86 make/mapfiles/libawt_xawt/mapfile-vers make/mapfiles/libdt_socket/mapfile-vers make/mapfiles/libextnet/mapfile-linux make/mapfiles/libextnet/mapfile-solaris make/mapfiles/libfontmanager/mapfile-vers make/mapfiles/libinstrument/mapfile-vers make/mapfiles/libj2gss/mapfile-vers make/mapfiles/libj2pcsc/mapfile-vers make/mapfiles/libj2pkcs11/mapfile-vers make/mapfiles/libj2ucrypto/mapfile-vers make/mapfiles/libjaas/mapfile-vers make/mapfiles/libjava/mapfile-vers make/mapfiles/libjava/reorder-sparc make/mapfiles/libjava/reorder-sparcv9 make/mapfiles/libjava/reorder-x86 make/mapfiles/libjawt/mapfile-vers make/mapfiles/libjdwp/mapfile-vers make/mapfiles/libjimage/mapfile-vers make/mapfiles/libjli/mapfile-vers make/mapfiles/libjpeg/mapfile-vers make/mapfiles/libjpeg/reorder-sparc make/mapfiles/libjpeg/reorder-sparcv9 make/mapfiles/libjpeg/reorder-x86 make/mapfiles/libjsdt/mapfile-vers make/mapfiles/libjsig/mapfile-vers-solaris make/mapfiles/libjsoundalsa/mapfile-vers make/mapfiles/liblcms/mapfile-vers make/mapfiles/libmanagement/mapfile-vers make/mapfiles/libmanagement_agent/mapfile-vers make/mapfiles/libmanagement_ext/mapfile-vers make/mapfiles/libmlib_image/mapfile-vers make/mapfiles/libnet/mapfile-vers make/mapfiles/libnio/mapfile-aix make/mapfiles/libnio/mapfile-linux make/mapfiles/libnio/mapfile-macosx make/mapfiles/libnio/mapfile-solaris make/mapfiles/libnio/reorder-sparc make/mapfiles/libnio/reorder-sparcv9 make/mapfiles/libnio/reorder-x86 make/mapfiles/libprefs/mapfile-vers make/mapfiles/librmi/mapfile-vers make/mapfiles/libsaproc/mapfile-linux make/mapfiles/libsaproc/mapfile-macosx make/mapfiles/libsaproc/mapfile-solaris make/mapfiles/libsctp/mapfile-vers make/mapfiles/libsplashscreen/mapfile-vers make/mapfiles/libsunec/mapfile-vers make/mapfiles/libunpack/mapfile-vers make/mapfiles/libverify/mapfile-vers make/mapfiles/libverify/reorder-sparc make/mapfiles/libverify/reorder-sparcv9 make/mapfiles/libverify/reorder-x86 make/mapfiles/libzip/mapfile-vers make/mapfiles/libzip/reorder-sparc make/mapfiles/libzip/reorder-sparcv9 make/mapfiles/libzip/reorder-x86 src/bsd/doc/man/ja/javah.1 src/bsd/doc/man/javah.1 src/hotspot/os/linux/os_linux.cpp src/hotspot/share/gc/cms/parCardTableModRefBS.cpp src/hotspot/share/gc/g1/g1AllocationContext.hpp src/hotspot/share/gc/g1/g1Allocator_ext.cpp src/hotspot/share/gc/g1/g1CollectedHeap_ext.cpp src/hotspot/share/gc/g1/g1DefaultPolicy.cpp src/hotspot/share/gc/g1/g1DefaultPolicy.hpp src/hotspot/share/gc/g1/g1FullCollector_ext.cpp src/hotspot/share/gc/g1/g1ParScanThreadState_ext.cpp src/hotspot/share/gc/g1/g1RootClosures_ext.cpp src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.cpp src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.hpp src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.inline.hpp src/hotspot/share/gc/shared/barrierSet.inline.hpp src/hotspot/share/gc/shared/cardTableModRefBS.cpp src/hotspot/share/gc/shared/cardTableModRefBS.hpp src/hotspot/share/gc/shared/cardTableModRefBS.inline.hpp src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.hpp src/hotspot/share/memory/universe.inline.hpp src/hotspot/share/prims/jvmtiEnter.hpp src/hotspot/share/prims/whitebox_ext.cpp src/hotspot/share/runtime/interfaceSupport.hpp src/hotspot/share/runtime/thread_ext.cpp src/hotspot/share/runtime/thread_ext.hpp src/hotspot/share/runtime/vmStructs_ext.hpp src/hotspot/share/services/serviceUtil.hpp src/hotspot/share/utilities/globalDefinitions_gcc.hpp src/java.base/linux/classes/sun/nio/ch/EPollArrayWrapper.java src/java.base/linux/native/libnio/ch/EPollArrayWrapper.c src/java.base/linux/native/libnio/ch/EPollPort.c src/java.base/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c src/java.base/macosx/native/libnio/ch/KQueuePort.c src/java.base/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java src/java.base/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java src/java.base/share/classes/sun/nio/ch/PollSelectorProvider.java src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java src/java.base/unix/classes/sun/nio/ch/PollArrayWrapper.java src/java.base/unix/native/libnio/ch/PollArrayWrapper.c src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c src/jdk.hotspot.agent/linux/native/libsaproc/test.c src/jdk.hotspot.agent/macosx/native/libsaproc/BsdDebuggerLocal.c src/jdk.hotspot.agent/macosx/native/libsaproc/StubDebuggerLocal.c src/jdk.hotspot.agent/macosx/native/libsaproc/ps_proc.c src/jdk.hotspot.agent/macosx/native/libsaproc/salibelf.c src/jdk.hotspot.agent/macosx/native/libsaproc/test.c src/jdk.hotspot.agent/solaris/native/libsaproc/saproc_audit.cpp src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/TraceInliningMode.java src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotArithmeticLIRGenerator.java src/linux/doc/man/ja/javah.1 src/linux/doc/man/javah.1 src/solaris/doc/sun/man/man1/ja/javah.1 src/solaris/doc/sun/man/man1/javah.1 test/hotspot/gtest/memory/test_chunkManager.cpp test/hotspot/gtest/runtime/test_threadstack_tracking.cpp test/hotspot/jtreg/compiler/aot/TEST.properties test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java test/jdk/java/io/ByteArrayOutputStream/WriteBounds.java test/jdk/java/nio/channels/DatagramChannel/SendToUnresolved.java test/langtools/tools/javac/TryWithResources/TwrShareCloseCode.java
diffstat 1825 files changed, 43344 insertions(+), 36937 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Mar 21 08:56:17 2018 +0100
+++ b/.hgtags	Fri Mar 30 21:19:21 2018 -0700
@@ -475,3 +475,5 @@
 4f96cf952e71cb8a127334494faf28880c26181b jdk-10+45
 1fd4d6068f54561cfc67d54fc9ca84af7212c4f8 jdk-11+3
 e59941f7247d451fa7df9eaef3fce0f492f8420c jdk-11+4
+d5c43e9f08fb9a7c74aae0d48daf17f2ad2afaef jdk-11+5
+3acb379b86725c47e7f33358cb22efa8752ae532 jdk-11+6
--- a/doc/testing.html	Wed Mar 21 08:56:17 2018 +0100
+++ b/doc/testing.html	Fri Mar 30 21:19:21 2018 -0700
@@ -40,7 +40,7 @@
 $ make run-test-jdk_lang JTREG="JOBS=8"
 $ make run-test TEST=jdk_lang
 $ make run-test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
-$ make run-test TEST="hotspot/test:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug"
+$ make run-test TEST="hotspot/test:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
 $ make run-test TEST="jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java"
 $ make exploded-run-test TEST=hotspot_tier1</code></pre>
 <h3 id="configuration">Configuration</h3>
@@ -77,8 +77,8 @@
 <h2 id="test-suite-control">Test suite control</h2>
 <p>It is possible to control various aspects of the test suites using make control variables.</p>
 <p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
-<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
-<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
+<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
+<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
 <p>As far as possible, the names of the keywords have been standardized between test suites.</p>
 <h3 id="jtreg-keywords">JTReg keywords</h3>
 <h4 id="jobs">JOBS</h4>
--- a/doc/testing.md	Wed Mar 21 08:56:17 2018 +0100
+++ b/doc/testing.md	Fri Mar 30 21:19:21 2018 -0700
@@ -18,7 +18,7 @@
     $ make run-test-jdk_lang JTREG="JOBS=8"
     $ make run-test TEST=jdk_lang
     $ make run-test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
-    $ make run-test TEST="hotspot/test:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug"
+    $ make run-test TEST="hotspot/test:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
     $ make run-test TEST="jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java"
     $ make exploded-run-test TEST=hotspot_tier1
 
@@ -140,11 +140,11 @@
 To separate multiple keyword=value pairs, use `;` (semicolon). Since the shell
 normally eats `;`, the recommended usage is to write the assignment inside
 qoutes, e.g. `JTREG="...;..."`. This will also make sure spaces are preserved,
-as in `JTREG="VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug"`.
+as in `JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`.
 
 (Other ways are possible, e.g. using backslash: `JTREG=JOBS=1\;TIMEOUT=8`.
 Also, as a special technique, the string `%20` will be replaced with space for
-certain options, e.g. `JTREG=VM_OTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
+certain options, e.g. `JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
 This can be useful if you have layers of scripts and have trouble getting
 proper quoting of command line arguments through.)
 
--- a/make/CompileJavaModules.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/CompileJavaModules.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -51,14 +51,6 @@
 # data files and shouldn't go in the product
 java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
 
-ifneq ($(filter solaris macosx linux windows,$(OPENJDK_TARGET_OS)), )
-  java.base_EXCLUDE_FILES += \
-      sun/nio/ch/AbstractPollSelectorImpl.java \
-      sun/nio/ch/PollSelectorImpl.java \
-      sun/nio/ch/PollSelectorProvider.java \
-      #
-endif
-
 ifneq ($(OPENJDK_TARGET_OS), solaris)
   java.base_EXCLUDE_FILES += \
       SolarisLoginModule.java \
--- a/make/CompileToolsHotspot.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/CompileToolsHotspot.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -120,6 +120,7 @@
       SRC := \
           $(SRC_DIR)/org.graalvm.word/src \
           $(SRC_DIR)/org.graalvm.collections/src \
+          $(SRC_DIR)/org.graalvm.compiler.bytecode/src \
           $(SRC_DIR)/org.graalvm.compiler.replacements.verifier/src \
           $(SRC_DIR)/org.graalvm.compiler.api.replacements/src \
           $(SRC_DIR)/org.graalvm.compiler.code/src \
--- a/make/Docs.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/Docs.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -108,7 +108,7 @@
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
-    -splitIndex --system none -html5 -javafx --expand-requires transitive \
+    -splitIndex --system none -javafx --expand-requires transitive \
     --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
--- a/make/Main.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/Main.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -266,14 +266,11 @@
 
 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
 
-hotspot-jsig:
-	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
-
 hotspot-ide-project:
 	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
 
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
-    $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
+    $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-ide-project
 
 ################################################################################
 # Build demos targets
@@ -909,9 +906,7 @@
 buildtools: buildtools-langtools interim-langtools interim-rmic \
     buildtools-jdk $(JVM_TOOLS_TARGETS)
 
-hotspot: $(HOTSPOT_VARIANT_TARGETS) hotspot-jsig
-
-hotspot-libs: hotspot-jsig
+hotspot: $(HOTSPOT_VARIANT_TARGETS)
 
 # Create targets hotspot-libs and hotspot-gensrc.
 $(foreach v, $(JVM_VARIANTS), \
--- a/make/autoconf/flags-cflags.m4	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/autoconf/flags-cflags.m4	Fri Mar 30 21:19:21 2018 -0700
@@ -394,8 +394,6 @@
     CFLAGS_OS_DEF_JVM="-D_WINDOWS -DWIN32 -D_JNI_IMPLEMENTATION_"
   fi
 
-  # Setup target OS define. Use OS target name but in upper case.
-  OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   CFLAGS_OS_DEF_JDK="$CFLAGS_OS_DEF_JDK -D$OPENJDK_TARGET_OS_UPPERCASE"
 
   #### GLOBAL DEFINES
--- a/make/autoconf/flags-ldflags.m4	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/autoconf/flags-ldflags.m4	Fri Mar 30 21:19:21 2018 -0700
@@ -99,7 +99,7 @@
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     BASIC_LDFLAGS="-nologo -opt:ref"
     BASIC_LDFLAGS_JDK_ONLY="-incremental:no"
-    BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows -base:0x8000000"
+    BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
   fi
 
   # Setup OS-dependent LDFLAGS
--- a/make/autoconf/flags.m4	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/autoconf/flags.m4	Fri Mar 30 21:19:21 2018 -0700
@@ -237,7 +237,11 @@
     MACHINE_FLAG="-q${OPENJDK_TARGET_CPU_BITS}"
   elif test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
     if test "x$OPENJDK_TARGET_CPU" != xaarch64 &&
-        test "x$OPENJDK_TARGET_CPU" != xarm; then
+       test "x$OPENJDK_TARGET_CPU" != xarm &&
+       test "x$OPENJDK_TARGET_CPU" != xmips &&
+       test "x$OPENJDK_TARGET_CPU" != xmipsel &&
+       test "x$OPENJDK_TARGET_CPU" != xmips64 &&
+       test "x$OPENJDK_TARGET_CPU" != xmips64el; then 
       MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
     fi
   fi
--- a/make/autoconf/hotspot.m4	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/autoconf/hotspot.m4	Fri Mar 30 21:19:21 2018 -0700
@@ -387,11 +387,10 @@
     fi
     INCLUDE_GRAAL="true"
   else
-    # By default enable graal build on linux-x64 or where AOT is available.
+    # By default enable graal build on x64 or where AOT is available.
     # graal build requires jvmci.
     if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
-        (test "x$OPENJDK_TARGET_CPU" = "xx86_64" && \
-         test "x$OPENJDK_TARGET_OS" = "xlinux" || \
+        (test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
          test "x$ENABLE_AOT" = "xtrue") ; then
       AC_MSG_RESULT([yes])
       JVM_FEATURES_graal="graal"
--- a/make/autoconf/platform.m4	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/autoconf/platform.m4	Fri Mar 30 21:19:21 2018 -0700
@@ -275,10 +275,13 @@
   OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
   OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
   OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
+  OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   OPENJDK_TARGET_LIBC="$VAR_LIBC"
+
   AC_SUBST(OPENJDK_TARGET_OS)
   AC_SUBST(OPENJDK_TARGET_OS_TYPE)
   AC_SUBST(OPENJDK_TARGET_OS_ENV)
+  AC_SUBST(OPENJDK_TARGET_OS_UPPERCASE)
   AC_SUBST(OPENJDK_TARGET_CPU)
   AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
   AC_SUBST(OPENJDK_TARGET_CPU_BITS)
--- a/make/autoconf/spec.gmk.in	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/autoconf/spec.gmk.in	Fri Mar 30 21:19:21 2018 -0700
@@ -65,6 +65,7 @@
 OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
 OPENJDK_TARGET_OS_TYPE:=@OPENJDK_TARGET_OS_TYPE@
 OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
+OPENJDK_TARGET_OS_UPPERCASE:=@OPENJDK_TARGET_OS_UPPERCASE@
 
 OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
 OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
@@ -518,6 +519,8 @@
 NM:=@NM@
 GNM:=@GNM@
 STRIP:=@STRIP@
+OBJDUMP:=@OBJDUMP@
+CXXFILT:=@CXXFILT@
 
 LIPO:=@LIPO@
 INSTALL_NAME_TOOL:=@INSTALL_NAME_TOOL@
--- a/make/autoconf/toolchain.m4	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/autoconf/toolchain.m4	Fri Mar 30 21:19:21 2018 -0700
@@ -863,6 +863,14 @@
     # bails if argument is missing.
     BASIC_FIXUP_EXECUTABLE(OBJDUMP)
   fi
+
+  case $TOOLCHAIN_TYPE in
+    gcc|clang|solstudio)
+      BASIC_CHECK_TOOLS(CXXFILT, [c++filt])
+      BASIC_CHECK_NONEMPTY(CXXFILT)
+      BASIC_FIXUP_EXECUTABLE(CXXFILT)
+      ;;
+  esac
 ])
 
 # Setup the build tools (i.e, the compiler and linker used to build programs
--- a/make/common/MakeBase.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/common/MakeBase.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -67,6 +67,7 @@
 # In GNU Make 4.0 and higher, there is a file function for writing to files.
 ifeq (4.0, $(firstword $(sort 4.0 $(MAKE_VERSION))))
   HAS_FILE_FUNCTION := true
+  CORRECT_FUNCTION_IN_RECIPE_EVALUATION := true
 endif
 
 ##############################
--- a/make/common/NativeCompilation.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/common/NativeCompilation.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -798,10 +798,6 @@
               "-map:$$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).map"
           $1_DEBUGINFO_FILES := $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).pdb \
               $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).map
-          # No separate command is needed for debuginfo on windows, instead
-          # touch target to make sure it has a later time stamp than the debug
-          # symbol files to avoid unnecessary relinking on rebuild.
-          $1_CREATE_DEBUGINFO_CMDS := $(TOUCH) $$($1_TARGET)
 
         else ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), )
           $1_DEBUGINFO_FILES := $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).debuginfo
@@ -816,15 +812,25 @@
           $1_DEBUGINFO_FILES := \
               $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \
               $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME)
-          # On Macosx, the debuginfo generation doesn't touch the linked binary, but
-          # to avoid always relinking, touch it anyway to force a later timestamp than
-          # the dSYM files.
           $1_CREATE_DEBUGINFO_CMDS := \
-              $(DSYMUTIL) --out $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM $$($1_TARGET) $$(NEWLINE) \
-              $(TOUCH) $$($1_TARGET)
+              $(DSYMUTIL) --out $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM $$($1_TARGET)
         endif # OPENJDK_TARGET_OS
 
+        # Since the link rule creates more than one file that we want to track,
+        # we have to use some tricks to get make to cooperate. To properly
+        # trigger downstream dependants of $$($1_DEBUGINFO_FILES), we must have
+        # a recipe in the rule below. To avoid rerunning the recipe every time
+        # have it touch the target. If a debuginfo file is deleted by something
+        # external, explicitly delete the TARGET to trigger a rebuild of both.
+        ifneq ($$(wildcard $$($1_DEBUGINFO_FILES)), $$($1_DEBUGINFO_FILES))
+          $$(call LogDebug, Deleting $$($1_BASENAME) because debuginfo files are missing)
+          $$(shell $(RM) $$($1_TARGET))
+        endif
         $$($1_DEBUGINFO_FILES): $$($1_TARGET)
+		$$(if $$(CORRECT_FUNCTION_IN_RECIPE_EVALUATION), \
+		  $$(if $$(wildcard $$@), , $$(error $$@ was not created for $$<)) \
+		)
+		$(TOUCH) $$@
 
         $1 += $$($1_DEBUGINFO_FILES)
 
@@ -859,9 +865,22 @@
     # Generating a dynamic library.
     $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
     ifeq ($(OPENJDK_TARGET_OS), windows)
-      $1_EXTRA_LDFLAGS += "-implib:$$($1_OBJECT_DIR)/$$($1_NAME).lib"
-      # Create a rule for the import lib so that other rules may depend on it
-      $$($1_OBJECT_DIR)/$$($1_NAME).lib: $$($1_TARGET)
+      $1_IMPORT_LIBRARY := $$($1_OBJECT_DIR)/$$($1_NAME).lib
+      $1_EXTRA_LDFLAGS += "-implib:$$($1_IMPORT_LIBRARY)"
+      # To properly trigger downstream dependants of the import library, just as
+      # for debug files, we must have a recipe in the rule. To avoid rerunning
+      # the recipe every time have it touch the target. If an import library
+      # file is deleted by something external, explicitly delete the target to
+      # trigger a rebuild of both.
+      ifneq ($$(wildcard $$($1_IMPORT_LIBRARY)), $$($1_IMPORT_LIBRARY))
+        $$(call LogDebug, Deleting $$($1_BASENAME) because import library is missing)
+        $$(shell $(RM) $$($1_TARGET))
+      endif
+      $$($1_IMPORT_LIBRARY): $$($1_TARGET)
+		$$(if $$(CORRECT_FUNCTION_IN_RECIPE_EVALUATION), \
+		  $$(if $$(wildcard $$@), , $$(error $$@ was not created for $$<)) \
+		)
+		$(TOUCH) $$@
     endif
 
     # Create loadmap on AIX. Helps in diagnosing some problems.
--- a/make/conf/jib-profiles.js	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/conf/jib-profiles.js	Fri Mar 30 21:19:21 2018 -0700
@@ -834,7 +834,7 @@
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc4.9.2-OEL6.4+1.2",
+        linux_x64: "gcc4.9.2-OEL6.4+1.3",
         macosx_x64: "Xcode6.3-MacOSX10.9+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
--- a/make/devkit/Tools.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/devkit/Tools.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -575,8 +575,8 @@
 	ln -s $(TARGET)-$* $@
 
   missing-links := $(addprefix $(PREFIX)/bin/, \
-      addr2line ar as c++ c++filt elfedit g++ gcc gprof ld nm objcopy ranlib readelf \
-      size strings strip ld.bfd ld.gold dtrace)
+      addr2line ar as c++ c++filt dwp elfedit g++ gcc gcc-$(GCC_VER) gprof ld ld.bfd \
+      ld.gold nm objcopy objdump ranlib readelf size strings strip)
 endif
 
 ##########################################################################################
--- a/make/hotspot/lib/CompileJvm.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/hotspot/lib/CompileJvm.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -248,10 +248,10 @@
 ifeq ($(OPENJDK_TARGET_OS), windows)
   # It doesn't matter which jvm.lib file gets exported, but we need
   # to pick just one.
-  ifeq ($(JVM_VARIANT), $(firstword $(JVM_VARIANTS)))
+  ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
     $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
         DEST := $(LIB_OUTPUTDIR), \
-        FILES :=$(JVM_VARIANT_OUTPUTDIR)/libjvm/objs/jvm.lib, \
+        FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
     ))
     TARGETS += $(COPY_JVM_LIB)
   endif
@@ -274,3 +274,62 @@
 include lib/JvmMapfile.gmk
 
 TARGETS += $(BUILD_LIBJVM)
+
+################################################################################
+# Hotspot disallows the use of global operators 'new' and 'delete'. This build
+# time check helps enforce this requirement. If you trigger this check and the
+# reference is not obvious from the source, GNU objdump can be used to help find
+# the reference if compiled with GCC:
+#
+# objdump -lrdSC <path/to/file.o>
+#
+# -C demangle
+# -d disassemble
+# -r print relocation entries, interspersed with the disassembly
+# -S print source code, intermixed with disassembly
+# -l include filenames and line numbers
+#
+# Search the output for the operator(s) of interest, to see where they are
+# referenced.
+
+ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
+
+  DEMANGLED_REGEXP := [^:]operator (new|delete)
+
+  # Running c++filt to find offending symbols in all files is too expensive,
+  # especially on Solaris, so use mangled names when looking for symbols.
+  # Save the demangling for when something is actually found.
+  ifeq ($(TOOLCHAIN_TYPE), solstudio)
+    MANGLED_SYMS := \
+        __1c2n6FL_pv_ \
+        __1c2N6FL_pv_ \
+        __1c2k6Fpv_v_ \
+        __1c2K6Fpv_v_ \
+        #
+    UNDEF_PATTERN := UNDEF
+  else
+    MANGLED_SYMS := \
+        _ZdaPv \
+        _ZdlPv \
+        _Znam \
+        _Znwm \
+        #
+    UNDEF_PATTERN := ' U '
+  endif
+
+  define SetupOperatorNewDeleteCheck
+    $1.op_check: $1
+	if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \
+	    | $(GREP) $(UNDEF_PATTERN)`" ]; then \
+	  $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \
+	  $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \
+	  $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \
+	  exit 1; \
+	fi
+	$(TOUCH) $$@
+
+    TARGETS += $1.op_check
+  endef
+
+  $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o)))
+endif
--- a/make/hotspot/lib/CompileLibjsig.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-#
-# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# Create the libjsig.so shared library
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include NativeCompilation.gmk
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
-  ifeq ($(STATIC_BUILD), false)
-    ifeq ($(OPENJDK_TARGET_OS), linux)
-      LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS)
-      LIBJSIG_LDFLAGS := $(LIBJSIG_HASHSTYLE_LDFLAGS) ${LIBJSIG_NOEXECSTACK_LDFLAGS} $(EXTRA_CFLAGS)
-      LIBJSIG_LIBS := $(LIBDL)
-
-      # NOTE: The old build compiled this library without -soname.
-      # To emulate this, we need to clear out SET_SHARED_LIBRARY_NAME.
-      SET_SHARED_LIBRARY_NAME :=
-
-      # Flags for other CPUs can be provided in EXTRA_CFLAGS
-      ifeq ($(OPENJDK_TARGET_CPU), x86_64)
-        LIBJSIG_CPU_FLAGS := -m64
-      else ifeq ($(OPENJDK_TARGET_CPU), x86)
-        LIBJSIG_CPU_FLAGS := -m32 -march=i586
-      else ifeq ($(OPENJDK_TARGET_CPU), ppc64)
-        LIBJSIG_CPU_FLAGS := -mcpu=powerpc64 -mtune=power5
-      else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
-        LIBJSIG_CPU_FLAGS := -DABI_ELFv2 -mcpu=power8 -mtune=power8
-      else ifeq ($(OPENJDK_TARGET_CPU), s390x)
-        LIBJSIG_CPU_FLAGS := -mbackchain -march=z10
-      endif
-
-    else ifeq ($(OPENJDK_TARGET_OS), solaris)
-      LIBJSIG_CFLAGS := -m64 -KPIC -mt -I $(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include
-      LIBJSIG_LDFLAGS := -m64 -mt -xnolib
-      LIBJSIG_LIBS := $(LIBDL)
-
-      # NOTE: The old build compiled this library without -soname.
-      # To emulate this, we need to clear out SET_SHARED_LIBRARY_NAME.
-      SET_SHARED_LIBRARY_NAME :=
-
-    else ifeq ($(OPENJDK_TARGET_OS), aix)
-      LIBJSIG_CFLAGS := -q64 -D_GNU_SOURCE -D_REENTRANT -qpic=large
-      LIBJSIG_LDFLAGS := -b64 -bexpall -G -bnoentry -qmkshrobj -brtl -bnolibpath -bernotok
-      LIBJSIG_LIBS := $(LIBDL)
-
-      # NOTE: The old build compiled this library without -soname.
-      # To emulate this, we need to clear out SET_SHARED_LIBRARY_NAME.
-      SET_SHARED_LIBRARY_NAME :=
-
-    else ifeq ($(OPENJDK_TARGET_OS), macosx)
-      LIBJSIG_CFLAGS := -m64 -D_GNU_SOURCE -pthread -mno-omit-leaf-frame-pointer -mstack-alignment=16 -fPIC
-      LIBJSIG_LDFLAGS := $(LIBJSIG_HASHSTYLE_LDFLAGS)
-    else
-      $(error Unknown target OS $(OPENJDK_TARGET_OS) in CompileLibjsig.gmk)
-    endif
-
-    LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig
-    LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
-    LIBJSIG_OUTPUTDIR := $(HOTSPOT_OUTPUTDIR)/libjsig
-
-    LIBJSIG_LDFLAGS += $(SHARED_LIBRARY_FLAGS)
-
-    LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
-
-    $(eval $(call SetupNativeCompilation, BUILD_LIBJSIG, \
-        NAME := jsig, \
-        SRC := $(LIBJSIG_SRC_DIR), \
-        OUTPUT_DIR := $(LIB_OUTPUTDIR), \
-        LANG := C, \
-        CFLAGS := $(LIBJSIG_CFLAGS) $(LIBJSIG_CPU_FLAGS), \
-        LDFLAGS := $(LIBJSIG_LDFLAGS) $(LIBJSIG_CPU_FLAGS), \
-        LIBS := $(LIBJSIG_LIBS), \
-        MAPFILE := $(LIBJSIG_MAPFILE), \
-        OBJECT_DIR := $(LIBJSIG_OUTPUTDIR)/objs, \
-    ))
-
-    TARGETS += $(BUILD_LIBJSIG)
-
-    ############################################################################
-    # Create symlinks in each variant sub dir
-    ifeq ($(OPENJDK_TARGET_OS), macosx)
-      DEBUG_INFO_SUFFIX := $(SHARED_LIBRARY_SUFFIX).dSYM
-    else
-      DEBUG_INFO_SUFFIX := .debuginfo
-    endif
-
-    # $1 variant subdir
-    define CreateSymlinks
-      # Always symlink from libdir/variant/libjsig.so -> ../libjsig.so and
-      # the corresponding debuginfo.
-      $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig): \
-          $(LIB_OUTPUTDIR)/$(call SHARED_LIBRARY,jsig)
-		$$(call MakeDir, $$(@D))
-		$(RM) $$@
-		$(LN) -s ../$$(@F) $$@
-
-      TARGETS += $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig)
-
-      ifeq ($(COPY_DEBUG_SYMBOLS), true)
-        $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig$(DEBUG_INFO_SUFFIX): \
-            $(LIB_OUTPUTDIR)/$(call SHARED_LIBRARY,jsig)
-		$$(call MakeDir, $$(@D))
-		$(RM) $$@
-		$(LN) -s ../$$(@F) $$@
-
-        TARGETS += $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig$(DEBUG_INFO_SUFFIX)
-
-        ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
-          $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig.diz: \
-              $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig$(DEBUG_INFO_SUFFIX)
-			$(CD) $$(@D) && $(ZIPEXE) -q -y $$@ $$(basename $$(@F))$(DEBUG_INFO_SUFFIX)
-
-          TARGETS += $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig.diz
-        endif
-      endif
-    endef
-
-    # The subdir is the same as the variant for client and minimal, for all
-    # others it's server.
-    VARIANT_SUBDIRS := $(filter client minimal, $(JVM_VARIANTS)) \
-        $(if $(filter-out client minimal, $(JVM_VARIANTS)), server)
-    $(foreach v, $(VARIANT_SUBDIRS), $(eval $(call CreateSymlinks,$v)))
-
-    ############################################################################
-
-    include CopyToExplodedJdk.gmk
-
-  endif
-endif
-
-all: $(TARGETS)
-
-.PHONY: all
--- a/make/hotspot/lib/JvmOverrideFiles.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
   BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
+  BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
   BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
   BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
 endif
@@ -111,6 +112,9 @@
 
   endif
 
+  # Workaround for jvmciCompilerToVM.cpp long compilation time
+  BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_OPTIMIZATION := NONE
+
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   # The copied fdlibm routines in these files must not be optimized
   BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
@@ -175,5 +179,10 @@
       os_windows.cpp \
       os_windows_x86.cpp \
       osThread_windows.cpp \
+      jvmciCompilerToVMInit.cpp \
       #
+
+  # Workaround for jvmciCompilerToVM.cpp long compilation time
+  BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_OPTIMIZATION := NONE
+
 endif
--- a/make/lib/Awt2dLibraries.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Awt2dLibraries.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -36,7 +36,6 @@
     -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
 
 BUILD_LIBMLIB_LDLIBS :=
-BUILD_LIBMLIB_IMAGE_MAPFILE := $(TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
 
 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
 
@@ -55,7 +54,6 @@
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(BUILD_LIBMLIB_CFLAGS), \
-    MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(BUILD_LIBMLIB_LDLIBS) \
@@ -107,7 +105,6 @@
       CFLAGS := -xarch=sparcvis \
           $(LIBMLIB_IMAGE_V_CFLAGS) \
           $(CFLAGS_JDKLIB), \
-      MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := -ljava -ljvm $(BUILD_LIBMLIB_LDLIBS), \
@@ -202,9 +199,9 @@
   LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
 endif
 
-LIBAWT_MAPFILE := $(TOPDIR)/make/mapfiles/libawt/mapfile-vers
 ifeq ($(OPENJDK_TARGET_OS), linux)
-  LIBAWT_MAPFILE :=
+  # FIXME: This is probably not what we want to do, but keep it now for compatibility.
+  LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
 endif
 
 # Turn off all warnings for debug_mem.c This is needed because the specific warning
@@ -229,7 +226,6 @@
     DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
     DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
     ASFLAGS := $(LIBAWT_ASFLAGS), \
-    MAPFILE := $(LIBAWT_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
     LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \
@@ -349,7 +345,6 @@
             implicit-fallthrough, \
         DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
             E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
-        MAPFILE := $(TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN) \
             -L$(INSTALL_LIBRARIES_HERE), \
@@ -405,7 +400,6 @@
     DISABLED_WARNINGS_clang := tautological-compare, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
     DISABLED_WARNINGS_microsoft := 4819, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
@@ -425,28 +419,13 @@
 
 LIBJAVAJPEG_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
 
-BUILD_LIBJAVAJPEG_REORDER :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    BUILD_LIBJAVAJPEG_REORDER := $(TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
-  endif
-endif
-
-
+# "DISABLED_WARNINGS_gcc := clobbered" rationale:
 # Suppress gcc warnings like "variable might be clobbered by 'longjmp'
 # or 'vfork'": this warning indicates that some variable is placed to
 # a register by optimized compiler and it's value might be lost on longjmp().
 # Recommended way to avoid such warning is to declare the variable as
 # volatile to prevent the optimization. However, this approach does not
 # work because we have to declare all variables as volatile in result.
-#ifndef CROSS_COMPILE_ARCH
-#  CC_43_OR_NEWER := \
-#      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
-#          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
-#  ifeq ($(CC_43_OR_NEWER), 1)
-#    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
-#  endif
-#endif
 
 ifeq ($(USE_EXTERNAL_LIBJPEG), true)
   LIBJPEG_LIBS := -ljpeg
@@ -469,12 +448,10 @@
         $(LIBJAVA_HEADER_FLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
     DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
     LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
-    REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
 ))
 
 $(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
@@ -510,13 +487,6 @@
       $(LIBJAVA_HEADER_FLAGS) \
       #
 
-  LIBAWT_HEADLESS_REORDER :=
-  ifeq ($(OPENJDK_TARGET_OS), solaris)
-    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-      LIBAWT_HEADLESS_REORDER := $(TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
-    endif
-  endif
-
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
       NAME := awt_headless, \
       SRC := $(LIBAWT_HEADLESS_DIRS), \
@@ -531,11 +501,9 @@
           $(LIBAWT_HEADLESS_CFLAGS), \
       DISABLED_WARNINGS_xlc := 1506-356, \
       DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
-      REORDER := $(LIBAWT_HEADLESS_REORDER), \
       LIBS_unix := -lawt -ljvm -ljava, \
       LIBS_linux := $(LIBM) $(LIBDL), \
       LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
@@ -571,7 +539,7 @@
       SRC := $(LIBFREETYPE_SRC)/src, \
       OPTIMIZATION := HIGHEST, \
       CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFREETYPE_HEADERS) \
-          -DFT2_BUILD_LIBRARY, \
+          -DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS), \
       DISABLED_WARNINGS_solstudio := \
          E_STATEMENT_NOT_REACHED \
          E_END_OF_LOOP_CODE_NOT_REACHED, \
@@ -626,8 +594,6 @@
 #### End harfbuzz configuration
 
 LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
-# This may be overridden in a custom makefile
-BUILD_LIBFONTMANAGER_MAPFILE ?= $(TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
 BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS)
 
 LIBFONTMANAGER_OPTIMIZATION := HIGH
@@ -682,7 +648,6 @@
         truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
         hidevf w_novirtualdescr arrowrtn2, \
     DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
-    MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
     LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
@@ -739,7 +704,7 @@
   $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
 
   $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
-      FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX), \
+      FILES := $(BUILD_LIBJAWT_IMPORT_LIBRARY), \
       DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
   ))
 
@@ -786,7 +751,6 @@
           $(LIBJAWT_CFLAGS), \
       CFLAGS_linux := $(HEADLESS_CFLAG), \
       CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
@@ -918,7 +882,6 @@
       DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
           E_STATEMENT_NOT_REACHED, \
       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
@@ -931,7 +894,7 @@
   TARGETS += $(BUILD_LIBSPLASHSCREEN)
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    $(BUILD_LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
+    $(BUILD_LIBSPLASHSCREEN): $(call FindLib, java.desktop, osxapp)
   endif
 
 endif
@@ -1009,7 +972,7 @@
 
   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
 
-  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
+  $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.desktop, osxapp)
 
   $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
 
@@ -1047,12 +1010,10 @@
 
   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
 
-  $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
+  $(BUILD_LIBOSXUI): $(call FindLib, java.desktop, osxapp)
 
   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
 
-  #$(BUILD_LIBOSXUI): $(call FindLib, java.base, java)
-
 endif
 
 ################################################################################
--- a/make/lib/CoreLibraries.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/CoreLibraries.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -95,12 +95,6 @@
 
 ##########################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    BUILD_LIBVERIFY_REORDER := $(TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
-  endif
-endif
-
 LIBVERIFY_OPTIMIZATION := HIGH
 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
   ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
@@ -115,12 +109,10 @@
     CFLAGS := $(CFLAGS_JDKLIB), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     DISABLED_WARNINGS_microsoft := 4244 4267, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
     LIBS_windows := jvm.lib, \
-    REORDER := $(BUILD_LIBVERIFY_REORDER), \
 ))
 
 TARGETS += $(BUILD_LIBVERIFY)
@@ -135,20 +127,11 @@
     -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
     -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
 
-# Make it possible to override this variable
-LIBJAVA_MAPFILE ?= $(TOPDIR)/make/mapfiles/libjava/mapfile-vers
-
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
   BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    LIBJAVA_REORDER := $(TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
-  endif
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
     NAME := java, \
     SRC := $(LIBJAVA_SRC_DIRS), \
@@ -160,13 +143,10 @@
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc := unused-result, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
-    MAPFILE := $(LIBJAVA_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
-    LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \
-        -export:getLastErrorString \
-        -export:getErrorString -delayload:shell32.dll, \
+    LDFLAGS_windows := -delayload:shell32.dll, \
     LIBS_unix := -ljvm -lverify, \
     LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
     LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM), \
@@ -178,7 +158,6 @@
     LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
         shell32.lib delayimp.lib \
         advapi32.lib version.lib, \
-    REORDER := $(LIBJAVA_REORDER), \
 ))
 
 TARGETS += $(BUILD_LIBJAVA)
@@ -194,13 +173,6 @@
   LIBZIP_EXCLUDES += zlib
 endif
 
-BUILD_LIBZIP_REORDER :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    BUILD_LIBZIP_REORDER := $(TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
-  endif
-endif
-
 ifeq ($(LIBZIP_CAN_USE_MMAP), true)
   BUILD_LIBZIP_MMAP := -DUSE_MMAP
 endif
@@ -217,13 +189,8 @@
         -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
-    REORDER := $(BUILD_LIBZIP_REORDER), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
-        -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \
-        -export:ZIP_InflateFully -export:ZIP_CRC32 -export:ZIP_FreeEntry, \
     LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \
     LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
 ))
@@ -252,13 +219,8 @@
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     CFLAGS_unix := -UDEBUG, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
-        -export:JIMAGE_PackageToModule \
-        -export:JIMAGE_FindResource -export:JIMAGE_GetResource \
-        -export:JIMAGE_ResourceIterator -export:JIMAGE_ResourcePath, \
     LIBS_unix := -ljvm -ldl $(LIBCXX), \
     LIBS_macosx := -lc++, \
     LIBS_windows := jvm.lib, \
@@ -344,31 +306,10 @@
     DISABLED_WARNINGS_solstudio := \
         E_ASM_DISABLES_OPTIMIZATION \
         E_STATEMENT_NOT_REACHED, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
     LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
-    LDFLAGS_windows := \
-        -export:JLI_Launch \
-        -export:JLI_ManifestIterate \
-        -export:JLI_SetTraceLauncher \
-        -export:JLI_ReportErrorMessage \
-        -export:JLI_ReportErrorMessageSys \
-        -export:JLI_ReportMessage \
-        -export:JLI_ReportExceptionDescription \
-        -export:JLI_MemAlloc \
-        -export:JLI_CmdToArgs \
-        -export:JLI_GetStdArgc \
-        -export:JLI_GetStdArgs \
-        -export:JLI_List_new \
-        -export:JLI_List_add \
-        -export:JLI_StringDup \
-        -export:JLI_MemFree \
-        -export:JLI_InitArgProcessing \
-        -export:JLI_PreprocessArg \
-        -export:JLI_AddArgsFromEnvVar \
-        -export:JLI_GetAppArgIndex, \
     LIBS_unix := $(LIBZ_LIBS), \
     LIBS_linux := $(LIBDL) -lpthread, \
     LIBS_solaris := $(LIBDL), \
--- a/make/lib/Lib-java.base.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.base.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -53,7 +53,6 @@
     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \
     DISABLED_WARNINGS_solstudio := E_ARG_INCOMPATIBLE_WITH_ARG_L, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libnet/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \
@@ -90,22 +89,6 @@
     $(LIBJAVA_HEADER_FLAGS) \
     $(addprefix -I, $(BUILD_LIBNET_SRC))
 
-ifeq ($(OPENJDK_TARGET_OS), linux)
-  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
-endif
-
-ifeq ($(OPENJDK_TARGET_OS), aix)
-  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     NAME := nio, \
     SRC := $(BUILD_LIBNIO_SRC), \
@@ -114,7 +97,6 @@
     WARNINGS_AS_ERRORS_xlc := false, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(BUILD_LIBNIO_CFLAGS), \
-    MAPFILE := $(BUILD_LIBNIO_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljava -lnet, \
@@ -171,6 +153,61 @@
 endif
 
 ################################################################################
+# Create the jsig library
+
+ifneq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(STATIC_BUILD), false)
+
+    LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig
+    LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
+
+    ifeq ($(OPENJDK_TARGET_OS), linux)
+      # FIXME: This is probably not what we want to do, but keep it now for compatibility.
+      LIBJSIG_CFLAGS := $(EXPORT_ALL_SYMBOLS)
+    endif
+
+    $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
+        NAME := jsig, \
+        SRC := $(LIBJSIG_SRC_DIR), \
+        CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
+        LDFLAGS := $(LDFLAGS_JDKLIB) \
+            $(call SET_SHARED_LIBRARY_ORIGIN), \
+        LIBS_linux := $(LIBDL), \
+        LIBS_solaris := $(LIBDL), \
+        LIBS_aix := $(LIBDL), \
+        MAPFILE := $(LIBJSIG_MAPFILE), \
+    ))
+
+    TARGETS += $(BUILD_LIBJSIG)
+
+    ############################################################################
+    # Create symlinks to libjsig in each JVM variant sub dir
+    LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
+
+    # $1 variant subdir
+    define CreateSymlinks
+      # Always symlink from libdir/variant/libjsig.so -> ../libjsig.so.
+      $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig): \
+          $(LIB_OUTPUTDIR)/$(call SHARED_LIBRARY,jsig)
+		$$(call MakeDir, $$(@D))
+		$(RM) $$@
+		$(LN) -s ../$$(@F) $$@
+
+      TARGETS += $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig)
+    endef
+
+    # The subdir is the same as the variant for client and minimal, for all
+    # others it's server.
+    VARIANT_SUBDIRS := $(filter client minimal, $(JVM_VARIANTS)) \
+        $(if $(filter-out client minimal, $(JVM_VARIANTS)), server)
+    $(foreach v, $(VARIANT_SUBDIRS), $(eval $(call CreateSymlinks,$v)))
+
+    ############################################################################
+
+  endif
+endif
+
+################################################################################
 # Create the symbols file for static builds.
 
 ifeq ($(STATIC_BUILD), true)
--- a/make/lib/Lib-java.desktop.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.desktop.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -34,10 +34,63 @@
 $(eval $(call FillCacheFind, $(wildcard $(LIB_java.desktop_SRC_DIRS))))
 
 ################################################################################
-# Create the AWT/2D and sound libraries
+# Create the AWT/2D libraries
 
 include Awt2dLibraries.gmk
-include SoundLibraries.gmk
+
+################################################################################
+# Create the libjsound library
+
+ifneq ($(OPENJDK_TARGET_OS), aix)
+
+  LIBJSOUND_SRC_DIRS := $(wildcard \
+      $(TOPDIR)/src/java.desktop/share/native/libjsound \
+      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libjsound \
+      )
+
+  LIBJSOUND_CFLAGS := \
+      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
+      $(LIBJAVA_HEADER_FLAGS) \
+      $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
+      -DX_PLATFORM=X_$(OPENJDK_TARGET_OS_UPPERCASE) \
+      -DUSE_PORTS=TRUE \
+      -DUSE_DAUDIO=TRUE \
+      #
+
+  ifneq ($(OPENJDK_TARGET_OS), solaris)
+    LIBJSOUND_CFLAGS += \
+        -DUSE_PLATFORM_MIDI_OUT=TRUE \
+        -DUSE_PLATFORM_MIDI_IN=TRUE \
+        #
+  endif
+
+  ifeq ($(OPENJDK_TARGET_OS), macosx)
+    LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
+  endif
+
+  $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
+      NAME := jsound, \
+      SRC := $(LIBJSOUND_SRC_DIRS), \
+      TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \
+      OPTIMIZATION := LOW, \
+      CFLAGS := $(CFLAGS_JDKLIB) \
+          $(LIBJSOUND_CFLAGS), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
+      LDFLAGS := $(LDFLAGS_JDKLIB) \
+          $(call SET_SHARED_LIBRARY_ORIGIN), \
+      LIBS_unix := -ljava -ljvm, \
+      LIBS_linux := $(ALSA_LIBS), \
+      LIBS_macosx := -framework CoreAudio -framework CoreFoundation \
+          -framework CoreServices -framework AudioUnit \
+          -framework CoreMIDI -framework AudioToolbox $(LIBCXX), \
+      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib dsound.lib winmm.lib user32.lib ole32.lib, \
+  ))
+
+  $(BUILD_LIBJSOUND): $(call FindLib, java.base, java)
+
+  TARGETS += $(BUILD_LIBJSOUND)
+
+endif
 
 ################################################################################
 # Create the macosx specific osxapp and osx libraries
--- a/make/lib/Lib-java.instrument.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.instrument.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -56,7 +56,6 @@
     CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
         $(LIBINSTRUMENT_LDFLAGS), \
@@ -73,17 +72,17 @@
     LIBS_aix := -liconv -ljli_static $(LIBDL), \
     LIBS_macosx := -liconv -framework Cocoa -framework Security \
         -framework ApplicationServices \
-        $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \
+        $(call FindStaticLib, java.base, jli_static), \
     LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
-        $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \
+        $(call FindStaticLib, java.base, jli_static), \
 ))
 
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix))
-  $(BUILD_LIBINSTRUMENT): $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
+ifneq ($(filter $(OPENJDK_TARGET_OS), macosx windows aix), )
+  $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static)
 else
   $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli, /jli)
 endif
-$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA)
+$(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java)
 
 TARGETS += $(BUILD_LIBINSTRUMENT)
 
--- a/make/lib/Lib-java.management.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.management.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -49,7 +49,6 @@
     SRC := $(LIBMANAGEMENT_SRC), \
     OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_CFLAGS), \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-java.prefs.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.prefs.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -39,7 +39,6 @@
     OPTIMIZATION := HIGH, \
     CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBPREF_SRC_DIRS)) \
         $(LIBJAVA_HEADER_FLAGS), \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libprefs/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
--- a/make/lib/Lib-java.rmi.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.rmi.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -32,7 +32,6 @@
     SRC := $(TOPDIR)/src/java.rmi/share/native/librmi, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.rmi, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/librmi/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
--- a/make/lib/Lib-java.security.jgss.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.security.jgss.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -39,7 +39,6 @@
       CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
           $(LIBJAVA_HEADER_FLAGS) \
           -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := $(LIBDL), \
--- a/make/lib/Lib-java.smartcardio.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-java.smartcardio.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -39,7 +39,6 @@
     CFLAGS_unix := -D__sun_jdk, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBJ2PCSC_CPPFLAGS), \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := $(LIBDL), \
--- a/make/lib/Lib-jdk.attach.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.attach.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -42,10 +42,8 @@
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \
         $(LIBJAVA_HEADER_FLAGS) $(LIBATTACH_CFLAGS), \
     CFLAGS_windows := /Gy, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_windows := -order:@$(TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
     LIBS := $(JDKLIB_LIBS), \
     LIBS_solaris := -ldoor, \
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
--- a/make/lib/Lib-jdk.crypto.cryptoki.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.crypto.cryptoki.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -37,7 +37,6 @@
     CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \
         $(LIBJAVA_HEADER_FLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.cryptoki, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := $(LIBDL), \
--- a/make/lib/Lib-jdk.crypto.ec.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.crypto.ec.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -55,7 +55,6 @@
           $(BUILD_LIBSUNEC_FLAGS), \
       DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
       DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
       LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := $(LIBCXX), \
--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -37,12 +37,11 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(addprefix -I, $(LIBJ2UCRYPTO_SRC)), \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(LIBDL), \
   ))
 
-  $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
+  $(BUILD_LIBJ2UCRYPTO): $(call FindLib, java.base, java)
 
   TARGETS += $(BUILD_LIBJ2UCRYPTO)
 
--- a/make/lib/Lib-jdk.hotspot.agent.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -29,17 +29,13 @@
 
 ################################################################################
 
-ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx windows), )
-  DISABLE_MAPFILES := true
-endif
-
 SA_TOPDIR := $(TOPDIR)/src/jdk.hotspot.agent
 
-# Defaults for most platforms
-SA_TOOLCHAIN := TOOLCHAIN_DEFAULT
-SA_NAME := saproc
-SA_SRC += $(SA_TOPDIR)/share/native/libsaproc $(SA_TOPDIR)/$(OPENJDK_TARGET_OS)/native/libsaproc
-SA_MAPFILE := $(TOPDIR)/make/mapfiles/libsaproc/mapfile-$(OPENJDK_TARGET_OS)
+SA_SRC += \
+    $(SA_TOPDIR)/share/native/libsaproc \
+    $(SA_TOPDIR)/$(OPENJDK_TARGET_OS)/native/libsaproc \
+    #
+
 SA_INCLUDES := \
     $(addprefix -I, $(SA_SRC)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/jdk.hotspot.agent \
@@ -47,48 +43,28 @@
     #
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
-  SA_CFLAGS := $(CFLAGS_JDKLIB) -D_FILE_OFFSET_BITS=64
-  ifeq ($(OPENJDK_TARGET_CPU), x86)
-    SA_LDFLAGS := -march=i586
-  endif
-
-  ifeq ($(INCLUDE_SA_ATTACH), true)
-    SA_LIBS := -lthread_db $(LIBDL)
-  endif
+  SA_CFLAGS := -D_FILE_OFFSET_BITS=64
 
 else ifeq ($(OPENJDK_TARGET_OS), solaris)
-  SA_TOOLCHAIN := TOOLCHAIN_LINK_CXX
-  SA_CFLAGS := $(CFLAGS_JDKLIB)
-  SA_CXXFLAGS := $(CXXFLAGS_JDKLIB)
-  SA_LDFLAGS := -mt $(LDFLAGS_CXX_JDK)
-  SA_LIBS := -ldl -ldemangle -lthread -lproc
+  SA_LDFLAGS := -mt
 
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
-  SA_EXCLUDE_FILES := BsdDebuggerLocal.c ps_proc.c salibelf.c StubDebuggerLocal.c
-  SA_CFLAGS := $(CFLAGS_JDKLIB) \
-      -Damd64 -D_GNU_SOURCE -mno-omit-leaf-frame-pointer \
+  SA_CFLAGS := -Damd64 -D_GNU_SOURCE -mno-omit-leaf-frame-pointer \
       -mstack-alignment=16 -fPIC
-  SA_LIBS := -framework Foundation -framework JavaNativeFoundation \
-      -framework JavaRuntimeSupport -framework Security -framework CoreFoundation
-
 else ifeq ($(OPENJDK_TARGET_OS), windows)
-  SA_NAME := sawindbg
-  COMMON_CFLAGS := -D_WINDOWS -D_DEBUG -D_CONSOLE -D_MBCS -EHsc
-  SA_CFLAGS := $(subst -DWIN32_LEAN_AND_MEAN,, $(CFLAGS_JDKLIB)) \
-      $(COMMON_CFLAGS)
-  SA_CXXFLAGS := $(subst -DWIN32_LEAN_AND_MEAN,, $(CXXFLAGS_JDKLIB)) \
-      $(COMMON_CFLAGS)
-  SA_LDFLAGS := -manifest
-  SA_LIBS := dbgeng.lib
+  SA_CFLAGS := -D_WINDOWS -D_DEBUG -D_CONSOLE -D_MBCS -EHsc
   ifeq ($(OPENJDK_TARGET_CPU), x86_64)
-    SA_CXXFLAGS += -DWIN64
+    SA_CXXFLAGS := -DWIN64
   else
-    SA_CXXFLAGS += -RTC1
+    SA_CXXFLAGS := -RTC1
   endif
 endif
 
 ifeq ($(INCLUDE_SA_ATTACH), true)
   SA_CFLAGS += -DINCLUDE_SA_ATTACH
+  ifeq ($(OPENJDK_TARGET_OS), linux)
+    SA_LIBS_linux := -lthread_db $(LIBDL)
+  endif
 endif
 
 SA_CFLAGS += -DLIBC=\"$(OPENJDK_TARGET_LIBC)\"
@@ -96,19 +72,20 @@
 ################################################################################
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
-    NAME := $(SA_NAME), \
-    TOOLCHAIN := $(SA_TOOLCHAIN), \
+    NAME := saproc, \
     OPTIMIZATION := NONE, \
     DISABLED_WARNINGS_microsoft := 4267, \
     DISABLED_WARNINGS_gcc := sign-compare, \
     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
     SRC := $(SA_SRC), \
-    EXCLUDE_FILES := test.c saproc_audit.cpp $(SA_EXCLUDE_FILES), \
-    CFLAGS := $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CUSTOM_CFLAGS), \
-    CXXFLAGS := $(SA_INCLUDES) $(SA_CXXFLAGS) $(SA_CUSTOM_CXXFLAGS), \
+    CFLAGS := $(CFLAGS_JDKLIB) $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CUSTOM_CFLAGS), \
+    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CXXFLAGS), \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
-    LIBS := $(SA_LIBS), \
-    MAPFILE := $(SA_MAPFILE), \
+    LIBS_linux := $(SA_LIBS_linux), \
+    LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
+    LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
+        -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
+    LIBS_windows := dbgeng.lib, \
 ))
 
 TARGETS += $(BUILD_LIBSA)
--- a/make/lib/Lib-jdk.jdi.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.jdi.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -46,7 +46,6 @@
       CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
           $(LIBDT_SHMEM_CPPFLAGS), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
-      LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
       LIBS := $(JDKLIB_LIBS), \
   ))
 
--- a/make/lib/Lib-jdk.jdwp.agent.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -42,10 +42,8 @@
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
         $(LIBDT_SOCKET_CPPFLAGS), \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
     LIBS_linux := -lpthread, \
     LIBS_solaris := -lnsl -lsocket, \
     LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
@@ -73,7 +71,6 @@
     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
         $(LIBJDWP_CPPFLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-jdk.management.agent.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.management.agent.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -38,7 +38,6 @@
     SRC := $(LIBMANAGEMENT_AGENT_SRC), \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_AGENT_CFLAGS), \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libmanagement_agent/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-jdk.management.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.management.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -59,7 +59,6 @@
     LANG := C, \
     OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_EXT_CFLAGS), \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libmanagement_ext/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-jdk.net.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.net.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -34,7 +34,6 @@
       SRC := $(TOPDIR)/src/jdk.net/$(OPENJDK_TARGET_OS)/native/libextnet, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-$(OPENJDK_TARGET_OS), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := -ljava, \
--- a/make/lib/Lib-jdk.pack.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.pack.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -40,7 +40,6 @@
         $(LIBJAVA_HEADER_FLAGS), \
     CFLAGS_release := -DPRODUCT, \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \
--- a/make/lib/Lib-jdk.sctp.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.sctp.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -41,7 +41,6 @@
             $(LIBJAVA_HEADER_FLAGS) \
             -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \
             -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
-        MAPFILE := $(TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS_unix := -lnio -lnet -ljava -ljvm, \
--- a/make/lib/Lib-jdk.security.auth.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/Lib-jdk.security.auth.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -27,18 +27,11 @@
 
 ################################################################################
 
-LIBJAAS_MAPFILE :=
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  # only on solaris...wonder why
-  LIBJAAS_MAPFILE := $(TOPDIR)/make/mapfiles/libjaas/mapfile-vers
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
     NAME := jaas, \
     SRC := $(call FindSrcDirsForLib, jdk.security.auth, jaas), \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.security.auth, \
-    MAPFILE := $(LIBJAAS_MAPFILE), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib $(JDKLIB_LIBS), \
--- a/make/lib/LibCommon.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ b/make/lib/LibCommon.gmk	Fri Mar 30 21:19:21 2018 -0700
@@ -36,8 +36,31 @@
 # elegant solution to this.
 WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
 
-ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx windows), )
-  DISABLE_MAPFILES := true
+# Tell the compiler not to export any functions unless declared so in
+# the source code. On Windows, this is the default and cannot be changed.
+# On Mac, we have always exported all symbols, probably due to oversight
+# and/or misunderstanding. To emulate this, don't hide any symbols
+# by default.
+# Also provide an override for non-conformant libraries.
+ifeq ($(TOOLCHAIN_TYPE), gcc)
+  CFLAGS_JDKLIB += -fvisibility=hidden
+  CXXFLAGS_JDKLIB += -fvisibility=hidden
+  LDFLAGS_JDKLIB += -Wl,--exclude-libs,ALL
+  EXPORT_ALL_SYMBOLS := -fvisibility=default
+else ifeq ($(TOOLCHAIN_TYPE), clang)
+  ifneq ($(OPENJDK_TARGET_OS), macosx)
+    CFLAGS_JDKLIB += -fvisibility=hidden
+    CXXFLAGS_JDKLIB += -fvisibility=hidden
+    EXPORT_ALL_SYMBOLS := -fvisibility=default
+  endif
+else ifeq ($(TOOLCHAIN_TYPE), solstudio)
+  CFLAGS_JDKLIB += -xldscope=hidden
+  CXXFLAGS_JDKLIB += -xldscope=hidden
+  EXPORT_ALL_SYMBOLS := -xldscope=global
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  CFLAGS_JDKLIB += -qvisibility=hidden
+  CXXFLAGS_JDKLIB += -qvisibility=hidden
+  EXPORT_ALL_SYMBOLS := -qvisibility=default
 endif
 
 ################################################################################
@@ -54,11 +77,19 @@
 # Find a library
 # Param 1 - module name
 # Param 2 - library name
-# Param 3 - subdir for library
+# Param 3 - optional subdir for library
 FindLib = \
     $(call FindLibDirForModule, \
         $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX)
 
+################################################################################
+# Find a static library
+# Param 1 - module name
+# Param 2 - library name
+# Param 3 - optional subdir for library
+FindStaticLib = \
+    $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
+        $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX))
 
 ################################################################################
 # Define the header include flags needed to compile against it.
--- a/make/lib/SoundLibraries.gmk	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-#
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-LIBJSOUND_SRC_DIRS := \
-    $(TOPDIR)/src/java.desktop/share/native/libjsound \
-    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjsound \
-    #
-LIBJSOUND_CFLAGS := \
-    -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-    $(LIBJAVA_HEADER_FLAGS) \
-    $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir)) \
-    #
-
-LIBJSOUND_SRC_FILES := Utilities.c Platform.c
-
-EXTRA_SOUND_JNI_LIBS :=
-
-LIBJSOUND_MIDIFILES := \
-    MidiInDevice.c \
-    MidiInDeviceProvider.c \
-    MidiOutDevice.c \
-    MidiOutDeviceProvider.c \
-    PlatformMidi.c
-
-# files needed for ports
-LIBJSOUND_PORTFILES := \
-    PortMixerProvider.c \
-    PortMixer.c
-
-# files needed for direct audio
-LIBJSOUND_DAUDIOFILES := \
-    DirectAudioDeviceProvider.c \
-    DirectAudioDevice.c
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  EXTRA_SOUND_JNI_LIBS += jsoundds
-  LIBJSOUND_CFLAGS += -DX_PLATFORM=X_WINDOWS \
-      -DUSE_PLATFORM_MIDI_OUT=TRUE \
-      -DUSE_PLATFORM_MIDI_IN=TRUE \
-      -DUSE_PORTS=TRUE
-  LIBJSOUND_SRC_FILES += \
-      PLATFORM_API_WinOS_Charset_Util.cpp \
-      PLATFORM_API_WinOS_MidiIn.cpp \
-      PLATFORM_API_WinOS_MidiOut.c \
-      PLATFORM_API_WinOS_Util.c \
-      PLATFORM_API_WinOS_Ports.c
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
-endif # OPENJDK_TARGET_OS windows
-
-ifeq ($(OPENJDK_TARGET_OS), linux)
-  EXTRA_SOUND_JNI_LIBS += jsoundalsa
-  LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
-endif # OPENJDK_TARGET_OS linux
-
-ifeq ($(OPENJDK_TARGET_OS), aix)
-  LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
-endif # OPENJDK_TARGET_OS aix
-
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-  LIBJSOUND_TOOLCHAIN := TOOLCHAIN_LINK_CXX
-  LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
-      -DUSE_PORTS=TRUE \
-      -DUSE_DAUDIO=TRUE \
-      -DUSE_PLATFORM_MIDI_OUT=TRUE \
-      -DUSE_PLATFORM_MIDI_IN=TRUE
-  LIBJSOUND_SRC_DIRS += $(TOPDIR)/src/java.desktop/macosx/native/libjsound
-  LIBJSOUND_SRC_FILES += \
-      PLATFORM_API_MacOSX_Utils.cpp \
-      PLATFORM_API_MacOSX_PCM.cpp \
-      PLATFORM_API_MacOSX_Ports.cpp \
-      PLATFORM_API_MacOSX_MidiIn.c \
-      PLATFORM_API_MacOSX_MidiOut.c \
-      PLATFORM_API_MacOSX_MidiUtils.c
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
-endif # OPENJDK_TARGET_OS macosx
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
-  LIBJSOUND_CFLAGS += -DX_PLATFORM=X_SOLARIS \
-      -DUSE_PORTS=TRUE \
-      -DUSE_DAUDIO=TRUE
-  LIBJSOUND_SRC_FILES += \
-      PLATFORM_API_SolarisOS_Utils.c \
-      PLATFORM_API_SolarisOS_Ports.c \
-      PLATFORM_API_SolarisOS_PCM.c
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
-  LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
-endif # OPENJDK_TARGET_OS solaris
-
-LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
-
-$(eval $(call SetupJdkLibrary, BUILD_LIBJSOUND, \
-    NAME := jsound, \
-    SRC := $(LIBJSOUND_SRC_DIRS), \
-    INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
-    TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \
-    OPTIMIZATION := LOW, \
-    CFLAGS := $(CFLAGS_JDKLIB) \
-        $(LIBJSOUND_CFLAGS), \
-    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
-    MAPFILE := $(TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
-    LDFLAGS := $(LDFLAGS_JDKLIB) \
-        $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LIBS_unix := -ljava -ljvm, \
-    LIBS_macosx := -framework CoreAudio -framework CoreFoundation \
-        -framework CoreServices -framework AudioUnit $(LIBCXX) \
-        -framework CoreMIDI -framework AudioToolbox, \
-    LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \
-))
-
-$(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
-
-TARGETS += $(BUILD_LIBJSOUND)
-
-##########################################################################################
-
-ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUNDALSA, \
-      NAME := jsoundalsa, \
-      SRC := $(LIBJSOUND_SRC_DIRS), \
-      INCLUDE_FILES := Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \
-          $(LIBJSOUND_DAUDIOFILES) \
-          PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
-          PLATFORM_API_LinuxOS_ALSA_PCM.c \
-          PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \
-          PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
-          PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
-          PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
-          PLATFORM_API_LinuxOS_ALSA_Ports.c, \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
-          $(LIBJSOUND_CFLAGS) \
-          -DUSE_DAUDIO=TRUE \
-          -DUSE_PORTS=TRUE \
-          -DUSE_PLATFORM_MIDI_OUT=TRUE \
-          -DUSE_PLATFORM_MIDI_IN=TRUE, \
-      MAPFILE := $(TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
-      LDFLAGS := $(LDFLAGS_JDKLIB) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS := $(ALSA_LIBS) -ljava -ljvm, \
-  ))
-
-  $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
-
-  TARGETS += $(BUILD_LIBJSOUNDALSA)
-
-endif
-
-##########################################################################################
-
-ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), )
-
-  $(eval $(call SetupJdkLibrary, BUILD_LIBJSOUNDDS, \
-      NAME := jsoundds, \
-      SRC := $(LIBJSOUND_SRC_DIRS), \
-      INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
-          PLATFORM_API_WinOS_Charset_Util.cpp \
-          PLATFORM_API_WinOS_DirectSound.cpp, \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          $(LIBJSOUND_CFLAGS) \
-          -DUSE_DAUDIO=TRUE, \
-      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LIBS := $(JDKLIB_LIBS) dsound.lib winmm.lib user32.lib ole32.lib, \
-  ))
-
-  $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
-
-  TARGETS += $(BUILD_LIBJSOUNDDS)
-
-endif
--- a/make/mapfiles/libattach/mapfile-aix	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
-	global:
-            Java_sun_tools_attach_VirtualMachineImpl_socket
-            Java_sun_tools_attach_VirtualMachineImpl_connect
-            Java_sun_tools_attach_VirtualMachineImpl_sendQuitTo
-            Java_sun_tools_attach_VirtualMachineImpl_checkPermissions
-            Java_sun_tools_attach_VirtualMachineImpl_close
-            Java_sun_tools_attach_VirtualMachineImpl_read
-            Java_sun_tools_attach_VirtualMachineImpl_write
-	local:
-		*;
-};
--- a/make/mapfiles/libattach/mapfile-linux	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
-	global:
-	    Java_sun_tools_attach_VirtualMachineImpl_checkPermissions;
-	    Java_sun_tools_attach_VirtualMachineImpl_close;
-	    Java_sun_tools_attach_VirtualMachineImpl_connect;
-	    Java_sun_tools_attach_VirtualMachineImpl_open;
-	    Java_sun_tools_attach_VirtualMachineImpl_sendQuitTo;
-            Java_sun_tools_attach_VirtualMachineImpl_sendQuitToChildrenOf;
-	    Java_sun_tools_attach_VirtualMachineImpl_socket;
-	    Java_sun_tools_attach_VirtualMachineImpl_read;
-	    Java_sun_tools_attach_VirtualMachineImpl_write;
-	local:
-		*;
-};
--- a/make/mapfiles/libattach/mapfile-solaris	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
-	global:
-            Java_sun_tools_attach_VirtualMachineImpl_checkPermissions;
-            Java_sun_tools_attach_VirtualMachineImpl_enqueue;
-            Java_sun_tools_attach_VirtualMachineImpl_open;
-	    Java_sun_tools_attach_VirtualMachineImpl_close;
-	    Java_sun_tools_attach_VirtualMachineImpl_read;
-	    Java_sun_tools_attach_VirtualMachineImpl_sigquit;
-	local:
-		*;
-};
--- a/make/mapfiles/libattach/reorder-windows-x86	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-jvm_attach_thread_func@4
-jvm_attach_thread_func_end
--- a/make/mapfiles/libattach/reorder-windows-x86_64	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-jvm_attach_thread_func
-jvm_attach_thread_func_end
--- a/make/mapfiles/libawt/mapfile-mawt-vers	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,280 +0,0 @@
-#
-# Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-# These are the libmawt exports. See mapfile-vers for the libawt exports
-
-SUNWprivate_1.1 {
-    global:
-        JNI_OnLoad;
-
-        Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
-        Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
-        Java_java_awt_AWTEvent_nativeSetSource;
-        Java_java_awt_Checkbox_initIDs;
-        Java_java_awt_Component_initIDs;
-        Java_java_awt_Dialog_initIDs;
-        Java_java_awt_Font_initIDs;
-        Java_java_awt_KeyboardFocusManager_initIDs;
-        Java_java_awt_Menu_initIDs;
-        Java_java_awt_MenuComponent_initIDs;
-        Java_java_awt_MenuItem_initIDs;
-        Java_java_awt_Scrollbar_initIDs;
-        Java_java_awt_ScrollPane_initIDs;
-        Java_java_awt_TextArea_initIDs;
-        Java_sun_awt_FontDescriptor_initIDs;
-        Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
-        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
-        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
-        Java_sun_awt_UNIXToolkit_check_1gtk;
-        Java_sun_awt_UNIXToolkit_load_1gtk;
-        Java_sun_awt_UNIXToolkit_unload_1gtk;
-        Java_sun_awt_UNIXToolkit_load_1stock_1icon;
-        Java_sun_awt_UNIXToolkit_load_1gtk_1icon;
-        Java_sun_awt_UNIXToolkit_nativeSync;
-        Java_sun_awt_X11InputMethod_disposeXIC;
-        Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
-        Java_sun_awt_X11InputMethod_resetXIC;
-        Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
-        Java_sun_awt_X11InputMethod_turnoffStatusWindow;
-        Java_sun_awt_SunToolkit_closeSplashScreen;
-        Java_sun_awt_PlatformFont_initIDs;
-        Java_sun_awt_X11GraphicsConfig_init;
-        Java_sun_awt_X11GraphicsConfig_dispose;
-        Java_sun_awt_X11GraphicsConfig_pGetBounds;
-        Java_sun_awt_X11GraphicsConfig_getNumColors;
-        Java_sun_awt_X11GraphicsConfig_getXResolution;
-        Java_sun_awt_X11GraphicsConfig_getYResolution;
-        Java_sun_awt_X11GraphicsConfig_createBackBuffer;
-        Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
-        Java_sun_awt_X11GraphicsConfig_swapBuffers;
-        Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
-        Java_sun_awt_X11GraphicsDevice_isDBESupported;
-        Java_sun_awt_X11GraphicsDevice_getDisplay;
-        Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
-        Java_sun_awt_X11GraphicsDevice_getNumConfigs;
-        Java_sun_awt_X11GraphicsDevice_initIDs;
-        Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
-        Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
-        Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
-        Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
-        Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
-        Java_sun_awt_X11GraphicsDevice_configDisplayMode;
-        Java_sun_awt_X11GraphicsDevice_resetNativeData;
-        Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
-        Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
-        Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
-        Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
-        Java_sun_awt_X11GraphicsEnvironment_initDisplay;
-        Java_sun_awt_X11GraphicsEnvironment_initGLX;
-        Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
-        Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
-        Java_sun_awt_X11GraphicsEnvironment_initXRender;
-        Java_java_awt_AWTEvent_initIDs;
-        Java_java_awt_Button_initIDs;
-        Java_java_awt_Container_initIDs;
-        Java_java_awt_Cursor_finalizeImpl;
-        Java_java_awt_Cursor_initIDs;
-        Java_java_awt_Event_initIDs;
-        Java_java_awt_event_InputEvent_initIDs;
-        Java_java_awt_event_KeyEvent_initIDs;
-        Java_java_awt_FileDialog_initIDs;
-        Java_java_awt_Frame_initIDs;
-        Java_java_awt_Insets_initIDs;
-        Java_java_awt_TextField_initIDs;
-        Java_java_awt_Window_initIDs;
-        Java_sun_awt_X11GraphicsConfig_init;
-        Java_sun_awt_X11GraphicsConfig_initIDs;
-        Java_sun_awt_X11GraphicsConfig_makeColorModel;
-        Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
-        Java_sun_awt_X11GraphicsDevice_getConfigColormap;
-        Java_sun_awt_X11GraphicsDevice_getConfigDepth;
-
-        Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
-        Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask;
-        Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
-        Java_sun_java2d_x11_X11Renderer_XFillSpans;
-        Java_sun_java2d_x11_X11Renderer_XDrawArc;
-        Java_sun_java2d_x11_X11Renderer_XDrawLine;
-        Java_sun_java2d_x11_X11Renderer_XDrawOval;
-        Java_sun_java2d_x11_X11Renderer_XDrawPoly;
-        Java_sun_java2d_x11_X11Renderer_XDrawRect;
-        Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
-        Java_sun_java2d_x11_X11Renderer_XDoPath;
-        Java_sun_java2d_x11_X11Renderer_XFillArc;
-        Java_sun_java2d_x11_X11Renderer_XFillOval;
-        Java_sun_java2d_x11_X11Renderer_XFillPoly;
-        Java_sun_java2d_x11_X11Renderer_XFillRect;
-        Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
-        Java_sun_java2d_x11_X11Renderer_devCopyArea;
-        Java_sun_java2d_x11_X11SurfaceData_initIDs;
-        Java_sun_java2d_x11_X11SurfaceData_initOps;
-        Java_sun_java2d_x11_X11SurfaceData_initSurface;
-        Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable;
-        Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
-        Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
-        Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
-
-        Java_sun_java2d_x11_XSurfaceData_initOps;
-        Java_sun_java2d_x11_XSurfaceData_XCreateGC;
-        Java_sun_java2d_x11_XSurfaceData_XResetClip;
-        Java_sun_java2d_x11_XSurfaceData_XSetClip;
-        Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
-        Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
-        Java_sun_java2d_x11_XSurfaceData_setInvalid;
-        Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
-        Java_sun_java2d_xr_XRSurfaceData_initXRPicture;
-        Java_sun_java2d_xr_XRSurfaceData_initIDs;
-        Java_sun_java2d_xr_XRSurfaceData_XRInitSurface;
-        Java_sun_java2d_xr_XRSurfaceData_freeXSDOPicture;
-        Java_sun_java2d_xr_XRBackendNative_initIDs;
-        Java_sun_java2d_xr_XIDGenerator_bufferXIDs;
-        Java_sun_java2d_xr_XRBackendNative_freeGC;
-        Java_sun_java2d_xr_XRBackendNative_createGC;
-        Java_sun_java2d_xr_XRBackendNative_createPixmap;
-        Java_sun_java2d_xr_XRBackendNative_createPictureNative;
-        Java_sun_java2d_xr_XRBackendNative_freePicture;
-        Java_sun_java2d_xr_XRBackendNative_freePixmap;
-        Java_sun_java2d_xr_XRBackendNative_setPictureRepeat;
-        Java_sun_java2d_xr_XRBackendNative_setGCExposures;
-        Java_sun_java2d_xr_XRBackendNative_setGCForeground;
-        Java_sun_java2d_xr_XRBackendNative_copyArea;
-        Java_sun_java2d_xr_XRBackendNative_renderComposite;
-        Java_sun_java2d_xr_XRBackendNative_renderRectangle;
-        Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative;
-        Java_sun_java2d_xr_XRBackendNative_XRSetTransformNative;
-        Java_sun_java2d_xr_XRBackendNative_XRCreateLinearGradientPaintNative;
-        Java_sun_java2d_xr_XRBackendNative_XRCreateRadialGradientPaintNative;
-        Java_sun_java2d_xr_XRBackendNative_setFilter;
-        Java_sun_java2d_xr_XRBackendNative_XRSetClipNative;
-        Java_sun_java2d_xr_XRBackendNative_putMaskNative;
-        Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative;
-        Java_sun_java2d_xr_XRBackendNative_XRFreeGlyphsNative;
-        Java_sun_java2d_xr_XRBackendNative_XRenderCreateGlyphSetNative;
-        Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative;
-        Java_sun_java2d_xr_XRBackendNative_setGCMode;
-        Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative;
-        Java_sun_java2d_xr_XRUtils_initFormatPtrs;
-        XRT_DrawGlyphList;
-
-        Java_sun_java2d_opengl_OGLContext_getOGLIdString;
-        Java_sun_java2d_opengl_OGLMaskFill_maskFill;
-        Java_sun_java2d_opengl_OGLRenderer_drawPoly;
-        Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
-        Java_sun_java2d_opengl_OGLSurfaceData_initTexture;
-        Java_sun_java2d_opengl_OGLSurfaceData_initFBObject;
-        Java_sun_java2d_opengl_OGLSurfaceData_initFlipBackbuffer;
-        Java_sun_java2d_opengl_OGLSurfaceData_getTextureID;
-        Java_sun_java2d_opengl_OGLSurfaceData_getTextureTarget;
-        Java_sun_java2d_opengl_OGLTextRenderer_drawGlyphList;
-        Java_sun_java2d_opengl_GLXGraphicsConfig_getGLXConfigInfo;
-        Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
-        Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
-        Java_sun_java2d_opengl_GLXSurfaceData_initOps;
-
-        Java_sun_print_CUPSPrinter_initIDs;
-        Java_sun_print_CUPSPrinter_getCupsServer;
-        Java_sun_print_CUPSPrinter_getCupsPort;
-        Java_sun_print_CUPSPrinter_getCupsDefaultPrinter;
-        Java_sun_print_CUPSPrinter_canConnect;
-        Java_sun_print_CUPSPrinter_getMedia;
-        Java_sun_print_CUPSPrinter_getPageSizes;
-        Java_sun_print_CUPSPrinter_getResolutions;
-
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1arrow;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box_1gap;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1check;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1expander;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1extension;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1flat_1box;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1focus;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1handle;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1hline;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1option;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1shadow;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1slider;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1vline;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1background;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeStartPainting;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeFinishPainting;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1switch_1theme;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1get_1gtk_1setting;
-        Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeSetRangeValue;
-        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetXThickness;
-        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetYThickness;
-        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetColorForState;
-        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetClassValue;
-        Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetPangoFontName;
-
-        awt_display;
-        awt_Lock;
-        awt_Unlock;
-        awt_GetDrawingSurface;
-        awt_FreeDrawingSurface;
-        awt_GetComponent;
-        awt_CreateEmbeddedFrame;
-        awt_SetBounds;
-        awt_SynthesizeWindowActivation;
-
-        X11SurfaceData_GetOps;
-        getDefaultConfig;
-            Java_sun_font_FontConfigManager_getFontConfig;
-            Java_sun_font_FontConfigManager_getFontConfigAASettings;
-        Java_sun_awt_FcFontManager_getFontPathNative;
-        Java_sun_font_SunFontManager_populateFontFileNameMap;
-
-        # CDE private entry point
-        Java_sun_awt_motif_XsessionWMcommand;
-        Java_sun_awt_motif_XsessionWMcommand_New;
-
-        # libfontmanager entry points
-        AWTIsHeadless;
-        AWTCountFonts;
-        AWTLoadFont;
-        AWTFreeFont;
-        AWTFontAscent;
-        AWTFontDescent;
-        AWTFontMinByte1;
-        AWTFontMaxByte1;
-        AWTFontMinCharOrByte2;
-        AWTFontMaxCharOrByte2;
-        AWTFontDefaultChar;
-        AWTFontPerChar;
-        AWTFontMaxBounds;
-        AWTFontTextExtents16;
-        AWTFreeChar;
-        AWTFontGenerateImage;
-        AWTCharAdvance;
-        AWTCharLBearing;
-        AWTCharRBearing;
-        AWTCharAscent;
-        AWTCharDescent;
-        AWTDrawGlyphList;
-        AccelGlyphCache_RemoveAllCellInfos;
-
-    local:
-        *;
-};
--- a/make/mapfiles/libawt/mapfile-vers	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-#
-# Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-# These are the libawt exports, mapfile-mawt-vers contains the libmawt exports.
-
-SUNWprivate_1.1 {
-    global:
-        JNI_OnLoad;
-
-        Java_java_awt_CheckboxMenuItem_initIDs;
-        Java_java_awt_Color_initIDs;
-        Java_java_awt_FontMetrics_initIDs;
-        Java_java_awt_image_BufferedImage_initIDs;
-        Java_sun_awt_image_DataBufferNative_getElem;
-        Java_sun_awt_image_DataBufferNative_setElem;
-        Java_java_awt_image_ColorModel_initIDs;
-        Java_java_awt_image_IndexColorModel_initIDs;
-        Java_java_awt_image_Kernel_initIDs;
-        Java_java_awt_image_Raster_initIDs;
-        Java_java_awt_image_SampleModel_initIDs;
-        Java_java_awt_Label_initIDs;
-        Java_java_awt_MenuBar_initIDs;
-        Java_java_awt_ScrollPaneAdjustable_initIDs;
-        Java_java_awt_Toolkit_initIDs;
-        Java_sun_awt_DebugSettings_setCTracingOn__Z;
-        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
-        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
-        Java_sun_awt_image_ByteComponentRaster_initIDs;
-        Java_sun_awt_image_GifImageDecoder_initIDs;
-        Java_sun_awt_image_GifImageDecoder_parseImage;
-        Java_sun_awt_image_ImageRepresentation_initIDs;
-        Java_sun_awt_image_ImageRepresentation_setDiffICM;
-        Java_sun_awt_image_ImageRepresentation_setICMpixels;
-        Java_sun_awt_image_ImagingLib_convolveBI;
-        Java_sun_awt_image_ImagingLib_convolveRaster;
-        Java_sun_awt_image_ImagingLib_init;
-        Java_sun_awt_image_ImagingLib_transformBI;
-        Java_sun_awt_image_ImagingLib_transformRaster;
-        Java_sun_awt_image_IntegerComponentRaster_initIDs;
-        Java_sun_awt_image_ShortComponentRaster_initIDs;
-        Java_sun_java2d_pipe_BufferedMaskBlit_enqueueTile;
-        Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
-        Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
-        Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
-        Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
-        Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
-        Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
-        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
-        Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
-        Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
-        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
-        Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
-        Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
-        Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
-        Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
-        Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
-        Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
-        Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
-        Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
-
-        Java_java_awt_Choice_initIDs;
-        Java_java_awt_Dimension_initIDs;
-        Java_java_awt_event_MouseEvent_initIDs;
-        Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
-        Java_java_awt_Rectangle_initIDs;
-        Java_sun_awt_image_BufImgSurfaceData_initIDs;
-        Java_sun_awt_image_BufImgSurfaceData_initRaster;
-        Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
-        Java_sun_awt_image_BytePackedRaster_initIDs;
-        Java_sun_awt_image_ImagingLib_lookupByteBI;
-        Java_sun_awt_image_ImagingLib_lookupByteRaster;
-        Java_sun_java2d_SurfaceData_initIDs;
-        Java_sun_java2d_SurfaceData_isOpaqueGray;
-        Java_sun_java2d_Disposer_initIDs;
-        Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
-        Java_sun_java2d_loops_BlitBg_BlitBg;
-        Java_sun_java2d_loops_Blit_Blit;
-        Java_sun_java2d_loops_ScaledBlit_Scale;
-        Java_sun_java2d_loops_DrawLine_DrawLine;
-        Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
-        Java_sun_java2d_loops_DrawPath_DrawPath;
-        Java_sun_java2d_loops_FillPath_FillPath;
-
-        Java_sun_java2d_loops_DrawRect_DrawRect;
-        Java_sun_java2d_loops_FillRect_FillRect;
-        Java_sun_java2d_loops_FillSpans_FillSpans;
-        Java_sun_java2d_loops_FillParallelogram_FillParallelogram;
-        Java_sun_java2d_loops_DrawParallelogram_DrawParallelogram;
-        Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
-        Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
-        Java_sun_java2d_loops_MaskBlit_MaskBlit;
-        Java_sun_java2d_loops_MaskFill_MaskFill;
-        Java_sun_java2d_loops_MaskFill_FillAAPgram;
-        Java_sun_java2d_loops_MaskFill_DrawAAPgram;
-        Java_sun_java2d_loops_TransformHelper_Transform;
-        Java_sun_java2d_pipe_Region_initIDs;
-        Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
-        sun_awt_image_GifImageDecoder_initIDs;
-
-        # libmawt entry points
-        SurfaceData_InitOps;
-        SurfaceData_ThrowInvalidPipeException;
-        SurfaceData_IntersectBlitBounds;
-        SurfaceData_IntersectBoundsXYXY;
-        Region_GetBounds;
-        Region_GetInfo;
-        Region_StartIteration;
-        Region_CountIterationRects;
-        Region_NextIteration;
-        Region_EndIteration;
-        RegionToYXBandedRectangles;
-        GrPrim_CompGetXorInfo;
-        GrPrim_CompGetAlphaInfo;
-        J2dTraceImpl;
-        J2dTraceInit;
-        img_makePalette;
-        initInverseGrayLut;
-        make_dither_arrays;
-        make_uns_ordered_dither_array;
-
-        # variables exported to libmawt
-        std_img_oda_red;
-        std_img_oda_blue;
-        std_img_oda_green;
-        std_odas_computed;
-        g_CMpDataID;
-        colorValueID;
-        mul8table;
-        div8table;
-        jvm;
-
-        # ProcessPath entry points and data
-        doDrawPath;
-        doFillPath;
-        path2DNumTypesID;
-        path2DTypesID;
-        path2DWindingRuleID;
-        path2DFloatCoordsID;
-        sg2dStrokeHintID;
-        sunHints_INTVAL_STROKE_PURE;
-
-        # CDE private entry points
-        # These are in awt_LoadLibrary.c and falls through to libmawt.
-        # Evidently CDE needs this for backward compatability.
-        Java_sun_awt_motif_XsessionWMcommand;
-        Java_sun_awt_motif_XsessionWMcommand_New;
-
-        # libfontmanager entry points
-        AWTIsHeadless;
-        GrPrim_Sg2dGetCompInfo;
-        GrPrim_Sg2dGetClip;
-        GetNativePrim;
-        SurfaceData_IntersectBounds;
-        SurfaceData_GetOps;
-        Disposer_AddRecord;
-        GrPrim_Sg2dGetEaRGB;
-        GrPrim_Sg2dGetPixel;
-        GrPrim_Sg2dGetLCDTextContrast;
-
-    local:
-        *;
-};
--- a/make/mapfiles/libawt/mapfile-vers-linux	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-#
-# Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface for libawt.so on Linux.
-# Linux port does not use mawt, all public symbols are in libawt.so
-
-SUNWprivate_1.1 {
-    global:
-        JNI_OnLoad;
-
-        Java_java_awt_CheckboxMenuItem_initIDs;
-        Java_java_awt_Color_initIDs;
-        Java_java_awt_FontMetrics_initIDs;
-        Java_java_awt_image_BufferedImage_initIDs;
-        Java_sun_awt_image_DataBufferNative_getElem;
-        Java_sun_awt_image_DataBufferNative_setElem;
-        Java_java_awt_image_ColorModel_initIDs;
-        Java_java_awt_image_IndexColorModel_initIDs;
-        Java_java_awt_image_Kernel_initIDs;
-        Java_java_awt_image_Raster_initIDs;
-        Java_java_awt_image_SampleModel_initIDs;
-        Java_java_awt_Label_initIDs;
-        Java_java_awt_MenuBar_initIDs;
-        Java_java_awt_ScrollPaneAdjustable_initIDs;
-        Java_java_awt_Toolkit_initIDs;
-        Java_java_awt_TrayIcon_initIDs;
-        Java_sun_awt_DebugSettings_setCTracingOn__Z;
-        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
-        Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
-        Java_sun_awt_image_ByteComponentRaster_initIDs;
-        Java_sun_awt_image_GifImageDecoder_initIDs;
-        Java_sun_awt_image_GifImageDecoder_parseImage;
-        Java_sun_awt_image_Image_initIDs;
-        Java_sun_awt_image_ImageRepresentation_initIDs;
-        Java_sun_awt_image_ImageRepresentation_setDiffICM;
-        Java_sun_awt_image_ImageRepresentation_setICMpixels;
-        Java_sun_awt_image_ImagingLib_convolveBI;
-        Java_sun_awt_image_ImagingLib_convolveRaster;
-        Java_sun_awt_image_ImagingLib_init;
-        Java_sun_awt_image_ImagingLib_transformBI;
-        Java_sun_awt_image_ImagingLib_transformRaster;
-        Java_sun_awt_image_IntegerComponentRaster_initIDs;
-        Java_sun_awt_image_ShortComponentRaster_initIDs;
-        Java_sun_java2d_pipe_SpanClipRenderer_eraseTile;
-        Java_sun_java2d_pipe_SpanClipRenderer_fillTile;
-        Java_sun_java2d_pipe_ShapeSpanIterator_addSegment;
-        Java_sun_java2d_pipe_ShapeSpanIterator_moveTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_lineTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_quadTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_curveTo;
-        Java_sun_java2d_pipe_ShapeSpanIterator_closePath;
-        Java_sun_java2d_pipe_ShapeSpanIterator_pathDone;
-        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeConsumer;
-        Java_sun_java2d_pipe_ShapeSpanIterator_appendPoly;
-        Java_sun_java2d_pipe_ShapeSpanIterator_dispose;
-        Java_sun_java2d_pipe_ShapeSpanIterator_getNativeIterator;
-        Java_sun_java2d_pipe_ShapeSpanIterator_getPathBox;
-        Java_sun_java2d_pipe_ShapeSpanIterator_initIDs;
-        Java_sun_java2d_pipe_ShapeSpanIterator_intersectClipBox;
-        Java_sun_java2d_pipe_ShapeSpanIterator_nextSpan;
-        Java_sun_java2d_pipe_ShapeSpanIterator_setNormalize;
-        Java_sun_java2d_pipe_ShapeSpanIterator_setOutputAreaXYXY;
-        Java_sun_java2d_pipe_ShapeSpanIterator_setRule;
-        Java_sun_java2d_pipe_ShapeSpanIterator_skipDownTo;
-
-        Java_java_awt_Choice_initIDs;
-        Java_java_awt_Dimension_initIDs;
-        Java_java_awt_event_MouseEvent_initIDs;
-        Java_java_awt_image_SinglePixelPackedSampleModel_initIDs;
-        Java_java_awt_Rectangle_initIDs;
-        Java_sun_awt_image_BufImgSurfaceData_getSurfaceData;
-        Java_sun_awt_image_BufImgSurfaceData_initIDs;
-        Java_sun_awt_image_BufImgSurfaceData_initRaster;
-        Java_sun_awt_image_BufImgSurfaceData_setSurfaceData;
-        Java_sun_awt_image_BufImgSurfaceData_freeNativeICMData;
-        Java_sun_awt_image_BytePackedRaster_initIDs;
-        Java_sun_awt_image_ImagingLib_lookupByteBI;
-        Java_sun_awt_image_ImagingLib_lookupByteRaster;
-        Java_sun_java2d_SurfaceData_initIDs;
-        Java_sun_java2d_SurfaceData_isOpaqueGray;
-        Java_sun_java2d_Disposer_initIDs;
-        Java_sun_java2d_DefaultDisposerRecord_invokeNativeDispose;
-        Java_sun_java2d_loops_BlitBg_BlitBg;
-        Java_sun_java2d_loops_Blit_Blit;
-        Java_sun_java2d_loops_ScaledBlit_Scale;
-        Java_sun_java2d_loops_DrawLine_DrawLine;
-        Java_sun_java2d_loops_DrawPolygons_DrawPolygons;
-        Java_sun_java2d_loops_DrawRect_DrawRect;
-        Java_sun_java2d_loops_FillRect_FillRect;
-        Java_sun_java2d_loops_FillSpans_FillSpans;
-        Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs;
-        Java_sun_java2d_loops_GraphicsPrimitiveMgr_registerNativeLoops;
-        Java_sun_java2d_loops_MaskBlit_MaskBlit;
-        Java_sun_java2d_loops_MaskFill_MaskFill;
-        Java_sun_java2d_loops_MaskFill_FillAAPgram;
-        Java_sun_java2d_loops_MaskFill_DrawAAPgram;
-        Java_sun_java2d_pipe_BufferedRenderPipe_fillSpans;
-        Java_sun_java2d_pipe_SpanClipRenderer_initIDs;
-        sun_awt_image_GifImageDecoder_initIDs;
-
-        # libmawt entry points
-        SurfaceData_InitOps;
-        SurfaceData_ThrowInvalidPipeException;
-        Region_GetBounds;
-        Region_GetInfo;
-        Region_StartIteration;
-        Region_CountIterationRects;
-        Region_NextIteration;
-        Region_EndIteration;
-        GrPrim_CompGetXorInfo;
-        GrPrim_CompGetAlphaInfo;
-        img_makePalette;
-        initInverseGrayLut;
-        make_dither_arrays;
-        make_uns_ordered_dither_array;
-
-        # variables exported to libmawt
-        std_img_oda_red;
-        std_img_oda_blue;
-        std_img_oda_green;
-        std_odas_computed;
-        g_CMpDataID;
-        colorValueID;
-        jvm;
-
-        # CDE private entry point
-        # This is in awt_LoadLibrary.c and falls through to libmawt.
-        # Evidently CDE needs this for backward compatability.
-        Java_sun_awt_motif_XsessionWMcommand;
-
-        # libfontmanager entry points
-        AWTIsHeadless;
-        GrPrim_Sg2dGetCompInfo;
-        GrPrim_Sg2dGetClip;
-        GetNativePrim;
-        SurfaceData_IntersectBounds;
-        SurfaceData_GetOps;
-        Disposer_AddRecord;
-        GrPrim_Sg2dGetEaRGB;
-        GrPrim_Sg2dGetPixel;
-        GrPrim_Sg2dGetLCDTextContrast;
-
-        Java_sun_awt_DefaultMouseInfoPeer_fillPointWithCoords;
-        Java_sun_awt_DefaultMouseInfoPeer_isWindowUnderMouse;
-        Java_java_awt_AWTEvent_nativeSetSource;
-        Java_java_awt_Checkbox_initIDs;
-        Java_java_awt_Component_initIDs;
-        Java_java_awt_Dialog_initIDs;
-        Java_java_awt_Font_initIDs;
-        Java_sun_awt_KeyboardFocusManagerPeerImpl_clearNativeGlobalFocusOwner;
-        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusOwner;
-        Java_sun_awt_KeyboardFocusManagerPeerImpl_getNativeFocusedWindow;
-        Java_java_awt_KeyboardFocusManager_initIDs;
-        Java_java_awt_Menu_initIDs;
-        Java_java_awt_MenuComponent_initIDs;
-        Java_java_awt_MenuItem_initIDs;
-        Java_java_awt_Scrollbar_initIDs;
-        Java_java_awt_ScrollPane_initIDs;
-        Java_java_awt_TextArea_initIDs;
-        Java_sun_awt_FontDescriptor_initIDs;
-        Java_sun_awt_X11InputMethod_disposeXIC;
-        Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
-        Java_sun_awt_X11InputMethod_resetXIC;
-        Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
-        Java_sun_awt_X11InputMethod_turnoffStatusWindow;
-        Java_sun_awt_SunToolkit_closeSplashScreen;
-        Java_sun_awt_PlatformFont_initIDs;
-        Java_sun_awt_X11GraphicsConfig_init;
-        Java_sun_awt_X11GraphicsConfig_dispose;
-        Java_sun_awt_X11GraphicsConfig_pGetBounds;
-        Java_sun_awt_X11GraphicsConfig_getNumColors;
-        Java_sun_awt_X11GraphicsConfig_getXResolution;
-        Java_sun_awt_X11GraphicsConfig_getYResolution;
-        Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
-        Java_sun_awt_X11GraphicsDevice_isDBESupported;
-        Java_sun_awt_X11GraphicsDevice_getDisplay;
-        Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
-        Java_sun_awt_X11GraphicsDevice_getNumConfigs;
-        Java_sun_awt_X11GraphicsDevice_initIDs;
-        Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
-        Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
-        Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
-        Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
-        Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
-        Java_sun_awt_X11GraphicsDevice_configDisplayMode;
-        Java_sun_awt_X11GraphicsDevice_resetNativeData;
-        Java_sun_awt_X11GraphicsDevice_getNativeScaleFactor;
-        Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
-        Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
-        Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
-        Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
-        Java_sun_awt_X11GraphicsEnvironment_initDisplay;
-        Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
-        Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
-        Java_sun_awt_X11GraphicsEnvironment_initXRender;
-
-        Java_java_awt_AWTEvent_initIDs;
-        Java_java_awt_Button_initIDs;
-        Java_java_awt_Container_initIDs;
-        Java_java_awt_Cursor_finalizeImpl;
-        Java_java_awt_Cursor_initIDs;
-        Java_java_awt_Event_initIDs;
-        Java_java_awt_event_InputEvent_initIDs;
-        Java_java_awt_event_KeyEvent_initIDs;
-        Java_java_awt_FileDialog_initIDs;
-        Java_java_awt_Frame_initIDs;
-        Java_java_awt_Insets_initIDs;
-        Java_java_awt_TextField_initIDs;
-        Java_java_awt_Window_initIDs;
-        Java_sun_awt_motif_X11OffScreenImage_updateBitmask;
-        Java_sun_awt_X11GraphicsConfig_init;
-        Java_sun_awt_X11GraphicsConfig_initIDs;
-        Java_sun_awt_X11GraphicsConfig_makeColorModel;
-        Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
-        Java_sun_awt_X11PMBlitLoops_Blit;
-        Java_sun_awt_X11PMBlitBgLoops_nativeBlitBg;
-        Java_sun_awt_X11Renderer_devFillSpans;
-        Java_sun_awt_X11Renderer_doDrawArc;
-        Java_sun_awt_X11Renderer_doDrawLine;
-        Java_sun_awt_X11Renderer_doDrawOval;
-        Java_sun_awt_X11Renderer_doDrawPoly;
-        Java_sun_awt_X11Renderer_doDrawRect;
-        Java_sun_awt_X11Renderer_doDrawRoundRect;
-        Java_sun_awt_X11Renderer_doFillArc;
-        Java_sun_awt_X11Renderer_doFillOval;
-        Java_sun_awt_X11Renderer_doFillPoly;
-        Java_sun_awt_X11Renderer_doFillRect;
-        Java_sun_awt_X11Renderer_doFillRoundRect;
-        Java_sun_awt_X11Renderer_devCopyArea;
-        Java_sun_awt_X11SurfaceData_initIDs;
-        Java_sun_awt_X11SurfaceData_initOps;
-        Java_sun_awt_X11SurfaceData_initSurface;
-        Java_sun_awt_X11SurfaceData_setInvalid;
-        Java_sun_awt_X11SurfaceData_flushNativeSurface;
-        awt_display;
-        awt_lock;
-        awt_Lock;
-        awt_Unlock;
-        awt_GetDrawingSurface;
-        awt_FreeDrawingSurface;
-        awt_GetComponent;
-        awt_CreateEmbeddedFrame;
-        awt_SetBounds;
-        awt_SynthesizeWindowActivation;
-
-        X11SurfaceData_GetOps;
-        getDefaultConfig;
-        Java_sun_font_FontConfigManager_getFontConfig;
-        Java_sun_font_FontConfigManager_getFontConfigAASettings;
-        Java_sun_awt_FcFontManager_getFontPathNative;
-        Java_sun_font_SunFontManager_populateFontFileNameMap;
-
-        # CDE private entry point
-        Java_sun_awt_motif_XsessionWMcommand;
-
-        # libfontmanager entry points
-        AWTIsHeadless;
-        AWTCountFonts;
-        AWTLoadFont;
-        AWTFreeFont;
-        AWTFontMinByte1;
-        AWTFontMaxByte1;
-        AWTFontMinCharOrByte2;
-        AWTFontMaxCharOrByte2;
-        AWTFontDefaultChar;
-        AWTFontPerChar;
-        AWTFontMaxBounds;
-        AWTFontTextExtents16;
-        AWTFreeChar;
-        AWTFontGenerateImage;
-        AWTCharAdvance;
-        AWTCharLBearing;
-        AWTCharRBearing;
-        AWTCharAscent;
-        AWTCharDescent;
-        AWTDrawGlyphList;
-        AccelGlyphCache_RemoveAllCellInfos;
-
-    local:
-        *;
-};
--- a/make/mapfiles/libawt_headless/mapfile-vers	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
-    global:
-        JNI_OnLoad;
-
-        Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
-        Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
-        Java_sun_java2d_x11_X11Renderer_XFillSpans;
-        Java_sun_java2d_x11_X11Renderer_XDrawArc;
-        Java_sun_java2d_x11_X11Renderer_XDrawLine;
-        Java_sun_java2d_x11_X11Renderer_XDrawOval;
-        Java_sun_java2d_x11_X11Renderer_XDrawPoly;
-        Java_sun_java2d_x11_X11Renderer_XDrawRect;
-        Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
-        Java_sun_java2d_x11_X11Renderer_XDoPath;
-        Java_sun_java2d_x11_X11Renderer_XFillArc;
-        Java_sun_java2d_x11_X11Renderer_XFillOval;
-        Java_sun_java2d_x11_X11Renderer_XFillPoly;
-        Java_sun_java2d_x11_X11Renderer_XFillRect;
-        Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
-        Java_sun_java2d_x11_X11Renderer_devCopyArea;
-        Java_sun_java2d_x11_X11SurfaceData_initIDs;
-        Java_sun_java2d_x11_X11SurfaceData_initSurface;
-        Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode;
-        Java_sun_java2d_x11_X11SurfaceData_XSetXorMode;
-        Java_sun_java2d_x11_X11SurfaceData_XSetForeground;
-
-        Java_sun_java2d_x11_XSurfaceData_initOps;
-        Java_sun_java2d_x11_XSurfaceData_XCreateGC;
-        Java_sun_java2d_x11_XSurfaceData_XResetClip;
-        Java_sun_java2d_x11_XSurfaceData_XSetClip;
-        Java_sun_java2d_x11_XSurfaceData_flushNativeSurface;
-        Java_sun_java2d_x11_XSurfaceData_isDrawableValid;
-        Java_sun_java2d_x11_XSurfaceData_setInvalid;
-        Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures;
-
-        X11SurfaceData_GetOps;
-        Java_java_awt_Font_initIDs;
-        Java_sun_font_FontConfigManager_getFontConfig;
-        Java_sun_font_FontConfigManager_getFontConfigAASettings;
-        Java_sun_font_FontConfigManager_getFontConfigVersion;
-        Java_sun_awt_FcFontManager_getFontPathNative;
-
-        Java_sun_awt_FontDescriptor_initIDs;
-        Java_sun_awt_PlatformFont_initIDs;
-
-        Java_sun_print_CUPSPrinter_initIDs;
-        Java_sun_print_CUPSPrinter_getCupsServer;
-        Java_sun_print_CUPSPrinter_getCupsPort;
-        Java_sun_print_CUPSPrinter_getCupsDefaultPrinter;
-        Java_sun_print_CUPSPrinter_canConnect;
-        Java_sun_print_CUPSPrinter_getMedia;
-        Java_sun_print_CUPSPrinter_getPageSizes;
-        Java_sun_print_CUPSPrinter_getResolutions;
-
-        # libfontmanager entry points
-        AWTIsHeadless;
-        AWTCountFonts;
-        AWTLoadFont;
-        AWTFreeFont;
-        AWTFontAscent;
-        AWTFontDescent;
-        AWTFontMinByte1;
-        AWTFontMaxByte1;
-        AWTFontMinCharOrByte2;
-        AWTFontMaxCharOrByte2;
-        AWTFontDefaultChar;
-        AWTFontPerChar;
-        AWTFontMaxBounds;
-        AWTFontTextExtents16;
-        AWTFreeChar;
-        AWTFontGenerateImage;
-        AWTCharAdvance;
-        AWTCharLBearing;
-        AWTCharRBearing;
-        AWTCharAscent;
-        AWTCharDescent;
-        AWTDrawGlyphList;
-        AccelGlyphCache_RemoveAllCellInfos;
-
-    local:
-        *;
-};
--- a/make/mapfiles/libawt_headless/reorder-sparc	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-# Temporary file for headless
--- a/make/mapfiles/libawt_headless/reorder-sparcv9	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-# Temporary file for headless
--- a/make/mapfiles/libawt_headless/reorder-x86	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-# Temporary file for headless
--- a/make/mapfiles/libawt_xawt/mapfile-vers	Wed Mar 21 08:56:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,468 +0,0 @@
-#
-# Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Define public interface.
-
-SUNWprivate_1.1 {
-    global:
-        JNI_OnLoad;
-        Java_sun_awt_X11_XlibWrapper_copyIntArray;
-        Java_sun_awt_X11_XlibWrapper_copyLongArray;
-        Java_sun_awt_X11_XlibWrapper_getAddress;
-        Java_sun_awt_X11_XlibWrapper_XConvertSelection;
-        Java_sun_awt_X11_XlibWrapper_XSetSelectionOwner;
-        Java_sun_awt_X11_XlibWrapper_XGetSelectionOwner;
-        Java_sun_awt_X11_XlibWrapper_XGetAtomName;
-        Java_sun_awt_X11_XlibWrapper_XMaxRequestSize;
-        Java_sun_awt_X11_XlibWrapper_XReparentWindow;
-        Java_sun_awt_X11_XlibWrapper_XAllocSizeHints;
-        Java_sun_awt_X11_XlibWrapper_XAllocWMHints;
-        Java_sun_awt_X11_XlibWrapper_XSetMinMaxHints;
-        Java_sun_awt_X11_XlibWrapper_XGetVisualInfo;
-        Java_sun_awt_X11_XlibWrapper_XOpenDisplay;
-        Java_sun_awt_X11_XlibWrapper_XCloseDisplay;
-        Java_sun_awt_X11_XlibWrapper_XDisplayString;
-        Java_sun_awt_X11_XlibWrapper_XSetCloseDownMode;
-        Java_sun_awt_X11_XlibWrapper_XCreateWindow;
-        Java_sun_awt_X11_XlibWrapper_XMapWindow;
-        Java_sun_awt_X11_XlibWrapper_XMapRaised;
-        Java_sun_awt_X11_XlibWrapper_XUnmapWindow;
-        Java_sun_awt_X11_XlibWrapper_XSelectInput;
-        Java_sun_awt_X11_XlibWrapper_XNextEvent;
-        Java_sun_awt_X11_XlibWrapper_XMaskEvent;
-        Java_sun_awt_X11_XlibWrapper_XWindowEvent;
-        Java_sun_awt_X11_XlibWrapper_XFilterEvent;
-        Java_sun_awt_X11_XlibWrapper_XSupportsLocale;
-        Java_sun_awt_X11_XlibWrapper_XSetLocaleModifiers;
-        Java_sun_awt_X11_XlibWrapper_XPeekEvent;
-        Java_sun_awt_X11_XlibWrapper_DefaultScreen;
-        Java_sun_awt_X11_XlibWrapper_ScreenOfDisplay;
-        Java_sun_awt_X11_XlibWrapper_DoesBackingStore;
-        Java_sun_awt_X11_XlibWrapper_RootWindow;
-        Java_sun_awt_X11_XlibWrapper_DisplayHeight;
-        Java_sun_awt_X11_XlibWrapper_DisplayWidthMM;
-        Java_sun_awt_X11_XlibWrapper_DisplayWidth;
-        Java_sun_awt_X11_XlibWrapper_DisplayHeightMM;
-        Java_sun_awt_X11_XlibWrapper_ScreenCount;
-        Java_sun_awt_X11_XlibWrapper_XMoveResizeWindow;
-        Java_sun_awt_X11_XlibWrapper_XResizeWindow;
-        Java_sun_awt_X11_XlibWrapper_XMoveWindow;
-        Java_sun_awt_X11_XlibWrapper_XGetWindowAttributes;
-        Java_sun_awt_X11_XlibWrapper_XGetGeometry;
-        Java_sun_awt_X11_XlibWrapper_XGrabPointer;
-        Java_sun_awt_X11_XlibWrapper_XUngrabPointer;
-        Java_sun_awt_X11_XlibWrapper_XGrabKeyboard;
-        Java_sun_awt_X11_XlibWrapper_XUngrabKeyboard;
-        Java_sun_awt_X11_XlibWrapper_XSetWindowBackground;
-        Java_sun_awt_X11_XlibWrapper_XFlush;
-        Java_sun_awt_X11_XlibWrapper_XSync;
-        Java_sun_awt_X11_XlibWrapper_XEventsQueued;
-        Java_sun_awt_X11_XlibWrapper_XRaiseWindow;
-        Java_sun_awt_X11_XlibWrapper_XLowerWindow;
-        Java_sun_awt_X11_XlibWrapper_XRestackWindows;
-        Java_sun_awt_X11_XlibWrapper_XSetInputFocus;
-        Java_sun_awt_X11_XlibWrapper_XSetInputFocus2;
-        Java_sun_awt_X11_XlibWrapper_XGetInputFocus;
-        Java_sun_awt_X11_XlibWrapper_XDestroyWindow;
-        Java_sun_awt_X11_XlibWrapper_XTranslateCoordinates;
-        Java_sun_awt_X11_XlibWrapper_XCreateFontCursor;
-        Java_sun_awt_X11_XlibWrapper_XSetTransientFor;
-        Java_sun_awt_X11_XlibWrapper_XSetWMHints;
-        Java_sun_awt_X11_XlibWrapper_XGetWMHints;
-        Java_sun_awt_X11_XlibWrapper_XShapeQueryExtension;
-        Java_sun_awt_X11_XlibWrapper_SetRectangularShape;
-        Java_sun_awt_X11_XlibWrapper_SetBitmapShape;
-        Java_sun_awt_X11_XlibWrapper_XConfigureWindow;
-        Java_sun_awt_X11_XlibWrapper_SetZOrder;
-        Java_sun_awt_X11_XToolkit_initIDs;
-        Java_sun_awt_X11_XWindow_getNativeColor;
-        Java_sun_awt_X11_XWindow_getWMInsets;
-        Java_sun_awt_X11_XWindow_getTopWindow;
-        Java_sun_awt_X11_XWindow_getWindowBounds;
-        Java_sun_awt_X11_XWindow_setSizeHints;
-        Java_sun_awt_X11_XWindow_getAWTKeyCodeForKeySym;
-        Java_sun_awt_X11_XWindow_getKeySymForAWTKeyCode;
-        Java_sun_awt_X11_XToolkit_nativeLoadSystemColors;
-        Java_sun_awt_X11_XToolkit_awt_1toolkit_1init;
-        Java_sun_awt_X11_XToolkit_awt_1output_1flush;
-        Java_sun_awt_X11_XToolkit_wakeup_1poll;
-        Java_java_awt_Cursor_finalizeImpl;
-        Java_sun_awt_X11_XlibWrapper_InternAtom;
-        Java_sun_awt_X11_XlibWrapper_GetProperty;
-        Java_sun_awt_X11_XlibWrapper_SetProperty;
-        Java_sun_awt_X11_XlibWrapper_XGetDefault;
-        Java_sun_awt_X11_XlibWrapper_XGetPointerMapping;
-        Java_sun_awt_X11_XlibWrapper_XScreenNumberOfScreen;
-        Java_sun_awt_X11_XlibWrapper_getScreenOfWindow;
-        Java_sun_awt_X11_XlibWrapper_XIconifyWindow;
-        Java_sun_awt_X11_XlibWrapper_XBell;
-        Java_sun_awt_X11_XlibWrapper_XChangePropertyImpl;
-        Java_sun_awt_X11_XlibWrapper_XChangePropertyS;
-        Java_sun_awt_X11_XlibWrapper_XGetWindowProperty;
-        Java_sun_awt_X11_XlibWrapper_getStringBytes;
-        Java_sun_awt_X11_XlibWrapper_XFree;
-        Java_sun_awt_X11_XlibWrapper_ServerVendor;
-        Java_sun_awt_X11_XlibWrapper_VendorRelease;
-        Java_sun_awt_X11_XlibWrapper_IsXsunKPBehavior;
-        Java_sun_awt_X11_XlibWrapper_IsSunKeyboard;
-        Java_sun_awt_X11_XlibWrapper_IsKanaKeyboard;
-        Java_sun_awt_X11_XlibWrapper_SetToolkitErrorHandler;
-        Java_sun_awt_X11_XlibWrapper_XSetErrorHandler;
-        Java_sun_awt_X11_XlibWrapper_CallErrorHandler;
-        Java_sun_awt_X11_XlibWrapper_PrintXErrorEvent;
-        Java_sun_awt_X11_XlibWrapper_XInternAtoms;
-        Java_sun_awt_X11_XlibWrapper_XChangeWindowAttributes;
-        Java_sun_awt_X11_XlibWrapper_XDeleteProperty;
-        Java_sun_awt_X11_XlibWrapper_XSetWMNormalHints;
-        Java_sun_awt_X11_XlibWrapper_XGetWMNormalHints;
-        Java_sun_awt_X11_XlibWrapper_XSendEvent;
-        Java_sun_awt_X11_XlibWrapper_XQueryTree;
-        Java_sun_awt_X11_XlibWrapper_memcpy;
-        Java_sun_awt_X11_XlibWrapper_XdbeQueryExtension;
-        Java_sun_awt_X11_XlibWrapper_XQueryExtension;
-        Java_sun_awt_X11_XlibWrapper_IsKeypadKey;
-        Java_sun_awt_X11_XlibWrapper_XdbeAllocateBackBufferName;
-        Java_sun_awt_X11_XlibWrapper_XdbeDeallocateBackBufferName;
-        Java_sun_awt_X11_XlibWrapper_XdbeSwapBuffers;
-        Java_sun_awt_X11_XlibWrapper_XdbeBeginIdiom;
-        Java_sun_awt_X11_XlibWrapper_XdbeEndIdiom;
-        Java_sun_awt_X11_XDesktopPeer_init;
-        Java_sun_awt_X11_XDesktopPeer_gnome_1url_1show;
-        Java_sun_awt_X11_XTaskbarPeer_init;
-        Java_sun_awt_X11_XTaskbarPeer_runloop;
-        Java_sun_awt_X11_XTaskbarPeer_setBadge;
-        Java_sun_awt_X11_XTaskbarPeer_setUrgent;
-        Java_sun_awt_X11_XTaskbarPeer_updateProgress;
-        Java_sun_awt_X11_XTaskbarPeer_setNativeMenu;
-        Java_sun_awt_X11_XRobotPeer_getRGBPixelsImpl;
-        Java_sun_awt_X11_XRobotPeer_keyPressImpl;
-        Java_sun_awt_X11_XRobotPeer_keyReleaseImpl;
-        Java_sun_awt_X11_XRobotPeer_mouseMoveImpl;
-        Java_sun_awt_X11_XRobotPeer_mousePressImpl;
-        Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl;
-        Java_sun_awt_X11_XRobotPeer_mouseWheelImpl;
-        Java_sun_awt_X11_XRobotPeer_setup;
-        Java_sun_awt_X11_XRobotPeer_loadNativeLibraries;
-        Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl;
-        Java_java_awt_Component_initIDs;
-        Java_java_awt_Container_initIDs;
-        Java_java_awt_Button_initIDs;
-        Java_java_awt_Scrollbar_initIDs;
-        Java_java_awt_Window_initIDs;
-        Java_java_awt_Frame_initIDs;
-        Java_sun_awt_SunToolkit_closeSplashScreen;
-        Java_sun_awt_UNIXToolkit_check_1gtk;
-        Java_sun_awt_UNIXToolkit_load_1gtk;
-        Java_sun_awt_UNIXToolkit_unload_1gtk;
-        Java_sun_awt_UNIXToolkit_load_1stock_1icon;
-        Java_sun_awt_UNIXToolkit_load_1gtk_1icon;
-        Java_sun_awt_UNIXToolkit_nativeSync;
-        Java_sun_awt_UNIXToolkit_gtkCheckVersionImpl;
-        Java_sun_awt_UNIXToolkit_get_1gtk_1version;
-        Java_java_awt_AWTEvent_initIDs;
-        Java_java_awt_event_InputEvent_initIDs;
-        Java_java_awt_event_KeyEvent_initIDs;
-        Java_java_awt_MenuComponent_initIDs;
-        Java_java_awt_Cursor_initIDs;
-        Java_java_awt_MenuItem_initIDs;
-        Java_java_awt_Menu_initIDs;
-        Java_java_awt_TextArea_initIDs;
-        Java_java_awt_Checkbox_initIDs;
-        Java_java_awt_ScrollPane_initIDs;
-        Java_java_awt_TextField_initIDs;
-        Java_java_awt_TrayIcon_initIDs;
-        Java_sun_font_FontConfigManager_getFontConfig;
-        Java_sun_font_FontConfigManager_getFontConfigAASettings;
-        Java_sun_font_FontConfigManager_getFontConfigVersion;
-        Java_sun_awt_FcFontManager_getFontPathNative;
-        Java_sun_awt_X11GraphicsEnvironment_initDisplay;
-        Java_sun_awt_X11GraphicsEnvironment_initGLX;
-        Java_sun_awt_X11GraphicsEnvironment_initXRender;
-        Java_sun_awt_X11GraphicsEnvironment_checkShmExt;
-        Java_sun_awt_X11GraphicsEnvironment_getNumScreens;
-        Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum;
-        Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
-        Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
-        Java_sun_awt_X11GraphicsEnvironment_getDisplayString;
-        Java_sun_awt_X11GraphicsDevice_initIDs;
-        Java_sun_awt_X11GraphicsDevice_getConfigVisualId;
-        Java_sun_awt_X11GraphicsDevice_getConfigDepth;
-        Java_sun_awt_X11GraphicsDevice_getNumConfigs;
-        Java_sun_awt_X11GraphicsDevice_getConfigColormap;
-        Java_sun_awt_X11GraphicsDevice_isDBESupported;
-        Java_sun_awt_X11GraphicsDevice_getDisplay;
-        Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
-        Java_sun_awt_X11GraphicsDevice_initXrandrExtension;
-        Java_sun_awt_X11GraphicsDevice_enterFullScreenExclusive;
-        Java_sun_awt_X11GraphicsDevice_exitFullScreenExclusive;
-        Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode;
-        Java_sun_awt_X11GraphicsDevice_enumDisplayModes;
-        Java_sun_awt_X11GraphicsDevice_configDisplayMode;
-        Java_sun_awt_X11GraphicsDevice_resetNativeData;
-        Java_sun_awt_X11GraphicsDevice_getNativeScaleFactor;
-        Java_sun_awt_X11GraphicsConfig_initIDs;
-        Java_sun_awt_X11GraphicsConfig_getXResolution;
-        Java_sun_awt_X11GraphicsConfig_getYResolution;
-        Java_sun_awt_X11GraphicsConfig_init;
-        Java_sun_awt_X11GraphicsConfig_dispose;
-        Java_sun_awt_X11GraphicsConfig_makeColorModel;
-        Java_sun_awt_X11GraphicsConfig_pGetBounds;
-        Java_sun_awt_X11GraphicsConfig_createBackBuffer;
-        Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
-        Java_sun_awt_X11GraphicsConfig_swapBuffers;
-        Java_sun_awt_X11GraphicsConfig_isTranslucencyCapable;
-        Java_sun_awt_X11_XToolkit_getTrayIconDisplayTimeout;
-        Java_java_awt_Insets_initIDs;
-        Java_java_awt_KeyboardFocusManager_initIDs;
-        Java_java_awt_Font_initIDs;
-        # libfontmanager entry points
-        AWTIsHeadless;
-        AWTCountFonts;
-        AWTLoadFont;
-        AWTFreeFont;
-        AWTFontAscent;
-        AWTFontDescent;
-        AWTFontMinByte1;
-        AWTFontMaxByte1;
-        AWTFontMinCharOrByte2;
-        AWTFontMaxCharOrByte2;
-        AWTFontDefaultChar;
-        AWTFontPerChar;
-        AWTFontMaxBounds;
-        AWTFontTextExtents16;
-        AWTFreeChar;
-        AWTFontGenerateImage;
-        AWTCharAdvance;
-        AWTCharLBearing;
-        AWTCharRBearing;
-        AWTCharAscent;
-        AWTCharDescent;
-        AWTDrawGlyphList;
-        AccelGlyphCache_RemoveAllCellInfos;
-
-        Java_sun_awt_X11_XToolkit_waitForEvents;
-        Java_java_awt_Event_initIDs;
-        Java_sun_awt_X11_XWindow_x11inputMethodLookupString;
-        Java_sun_awt_X11_XWindow_haveCurrentX11InputMethodInstance;
-        Java_java_awt_AWTEvent_nativeSetSource;
-        Java_java_awt_Dialog_initIDs;
-        Java_sun_awt_PlatformFont_initIDs;
-        Java_sun_awt_FontDescriptor_initIDs;
-        Java_sun_awt_X11_XFontPeer_initIDs;
-        Java_sun_awt_X11InputMethod_initIDs;
-        Java_sun_awt_X11InputMethod_resetXIC;
-        Java_sun_awt_X11InputMethod_disposeXIC;
-        Java_sun_awt_X11InputMethod_setCompositionEnabledNative;
-        Java_sun_awt_X11InputMethod_isCompositionEnabledNative;
-        Java_sun_awt_X11InputMethod_turnoffStatusWindow;
-        Java_sun_awt_X11_XInputMethod_openXIMNative;
-        Java_sun_awt_X11_XInputMethod_createXICNative;
-        Java_sun_awt_X11_XInputMethod_setXICFocusNative;
-        Java_sun_awt_X11_XInputMethod_adjustStatusWindow;
-        Java_sun_awt_X11_XlibWrapper_XQueryPointer;
-        Java_sun_awt_X11_XlibWrapper_XFreeCursor;
-        Java_sun_awt_X11_XToolkit_getDefaultXColormap;
-        Java_sun_awt_X11_XToolkit_getDefaultScreenData;
-        Java_sun_awt_X11_XToolkit_getEnv;
-        Java_sun_awt_X11_XlibWrapper_XCreateBitmapFromData;
-        Java_sun_awt_X11_XlibWrapper_XFreePixmap;
-        Java_sun_awt_X11_XlibWrapper_XAllocColor;
-        Java_sun_awt_X11_XlibWrapper_XCreatePixmapCursor;
-        Java_sun_awt_X11_XlibWrapper_XQueryBestCursor;
-        Java_sun_awt_X11_XlibWrapper_XCreatePixmap;
-        Java_sun_awt_X11_XlibWrapper_XCreateImage;
-        Java_sun_awt_X11_XlibWrapper_XCreateGC;
-        Java_sun_awt_X11_XlibWrapper_XDestroyImage;
-        Java_sun_awt_X11_XlibWrapper_XPutImage;
-        Java_sun_awt_X11_XlibWrapper_XFreeGC;
-        Java_sun_awt_X11_XlibWrapper_XSetWindowBackgroundPixmap;
-        Java_sun_awt_X11_XlibWrapper_XClearWindow;
-        Java_sun_awt_X11_XlibWrapper_XGetIconSizes;
-        Java_sun_awt_X11_XlibWrapper_XKeycodeToKeysym;
-        Java_sun_awt_X11_XlibWrapper_XKeysymToKeycode;
-        Java_sun_awt_X11_XlibWrapper_XQueryKeymap;
-        Java_sun_awt_X11_XlibWrapper_XkbGetEffectiveGroup;
-        Java_sun_awt_X11_XlibWrapper_XkbSelectEvents;
-        Java_sun_awt_X11_XlibWrapper_XkbSelectEventDetails;
-        Java_sun_awt_X11_XlibWrapper_XkbKeycodeToKeysym;
-        Java_sun_awt_X11_XlibWrapper_XkbLibraryVersion;
-        Java_sun_awt_X11_XlibWrapper_XkbQueryExtension;
-        Java_sun_awt_X11_XlibWrapper_XkbGetMap;
-        Java_sun_awt_X11_XlibWrapper_XkbGetUpdatedMap;
-        Java_sun_awt_X11_XlibWrapper_XkbFreeKeyboard;
-        Java_sun_awt_X11_XlibWrapper_XkbTranslateKeyCode;
-        Java_sun_awt_X11_XlibWrapper_XkbSetDetectableAutoRepeat;
-        Java_sun_awt_X11_XlibWrapper_XGetModifierMapping;
-        Java_sun_awt_X11_XlibWrapper_XFreeModifiermap;
-        Java_sun_awt_X11_XlibWrapper_XRefreshKeyboardMapping;
-        Java_sun_awt_X11_XlibWrapper_XChangeActivePointerGrab;
-        Java_sun_awt_X11_XlibWrapper_XNextSecondaryLoopEvent;
-        Java_sun_awt_X11_XlibWrapper_ExitSecondaryLoop;
-        Java_sun_awt_X11_XlibWrapper_XTextPropertyToStringList;
-        Java_sun_awt_X11_XlibWrapper_XGrabServer;
-        Java_sun_awt_X11_XlibWrapper_XUngrabServer;
-        Java_sun_awt_X11_XlibWrapper_XPutBackEvent;
-        Java_sun_awt_X11_XlibWrapper_XConvertCase;
-        Java_sun_awt_X11_XlibWrapper_XSynchronize;
-        Java_java_awt_FileDialog_initIDs;
-        Java_sun_awt_X11_XWindow_initIDs;
-        Java_sun_awt_X11_XWindowPeer_getLocalHostname;
-        Java_sun_awt_X11_XWindowPeer_getJvmPID;
-
-        Java_sun_java2d_opengl_OGLContext_getOGLIdString;
-        Java_sun_java2d_opengl_OGLMaskFill_maskFill;
-        Java_sun_java2d_opengl_OGLRenderer_drawPoly;
-        Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;
-        Java_sun_java2d_opengl_OGLSurfaceData_initTexture;
-        Java_sun_java2d_opengl_OGLSurfaceData_initFBObject;
-        Java_sun_java2d_opengl_OGLSurfaceData_initFlipBackbuffer;
-        Java_sun_java2d_opengl_OGLSurfaceData_getTextureID;
-        Java_sun_java2d_opengl_OGLSurfaceData_getTextureTarget;
-        Java_sun_java2d_opengl_OGLTextRenderer_drawGlyphList;
-        Java_sun_java2d_opengl_GLXGraphicsConfig_getGLXConfigInfo;
-        Java_sun_java2d_opengl_GLXGraphicsConfig_initConfig;
-        Java_sun_java2d_opengl_GLXGraphicsConfig_getOGLCapabilities;
-        Java_sun_java2d_opengl_GLXSurfaceData_initOps;
-
-        Java_sun_java2d_x11_X11PMBlitBgLoops_nativeBlitBg;
-        Java_sun_java2d_x11_X11PMBlitLoops_nativeBlit;
-        Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask;
-        Java_sun_java2d_x11_X11Renderer_XFillSpans;
-        Java_sun_java2d_x11_X11Renderer_XDrawArc;
-        Java_sun_java2d_x11_X11Renderer_XDrawLine;
-        Java_sun_java2d_x11_X11Renderer_XDrawOval;
-        Java_sun_java2d_x11_X11Renderer_XDrawPoly;
-        Java_sun_java2d_x11_X11Renderer_XDrawRect;
-        Java_sun_java2d_x11_X11Renderer_XDrawRoundRect;
-        Java_sun_java2d_x11_X11Renderer_XDoPath;
-        Java_sun_java2d_x11_X11Renderer_XFillArc;
-        Java_sun_java2d_x11_X11Renderer_XFillOval;
-        Java_sun_java2d_x11_X11Renderer_XFillPoly;
-        Java_sun_java2d_x11_X11Renderer_XFillRect;
-        Java_sun_java2d_x11_X11Renderer_XFillRoundRect;
-        Java_sun_java2d_x11_X11Renderer_devCopyArea;
-        Java_sun_java2d_x11_X11SurfaceData_initIDs;
-        Java_sun_java2d_x11_X11SurfaceData_isShmPMAvailable;
-        Java_sun_java2d_x11_X11SurfaceData_initSurface;