changeset 54530:d446deea67ba datum

manual merge with default
author vromero
date Wed, 23 Jan 2019 16:43:37 -0500
parents 1a12516c63e4 e3ed96060992
children 007a2bcbbe6b 4eb719ce6afb
files make/autoconf/spec.gmk.in make/hotspot/symbols/symbols-unix src/hotspot/share/classfile/classFileParser.cpp src/hotspot/share/classfile/classFileParser.hpp src/hotspot/share/classfile/systemDictionary.hpp src/hotspot/share/classfile/vmSymbols.hpp src/hotspot/share/gc/g1/evacuationInfo.hpp src/hotspot/share/include/jvm.h src/hotspot/share/oops/instanceKlass.cpp src/hotspot/share/oops/instanceKlass.hpp src/hotspot/share/oops/klass.cpp src/hotspot/share/oops/klass.hpp src/hotspot/share/prims/jvm.cpp src/java.base/share/classes/java/lang/Class.java src/java.base/share/native/libjava/Class.c src/java.base/unix/native/libnio/ch/SocketChannelImpl.c src/java.base/unix/native/libnio/ch/SocketDispatcher.c src/java.base/windows/native/libnio/ch/SocketChannelImpl.c src/java.compiler/share/classes/javax/lang/model/util/Elements.java src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java src/java.desktop/share/classes/sun/awt/TracedEventQueue.java src/java.desktop/share/classes/sun/awt/image/BadDepthException.java src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties test/jdk/java/lang/String/AlignIndent.java test/jdk/javax/net/ssl/compatibility/Parameter.java test/jdk/sun/security/util/Resources/NewNamesFormat.java test/jdk/sun/security/util/Resources/NewResourcesNames.java test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLankmarkRegions.java test/langtools/tools/javac/RawStringLiteralLang.java test/langtools/tools/javac/RawStringLiteralLangAPI.java test/langtools/tools/javac/diags/examples/RawStringLiteral.java
diffstat 2236 files changed, 24127 insertions(+), 57002 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 03 21:25:54 2019 +0100
+++ b/.hgtags	Wed Jan 23 16:43:37 2019 -0500
@@ -531,3 +531,9 @@
 11033c4ada542f9c9a873314b6ecf60af19e8256 jdk-13+1
 7496df94b3b79f3da53925d2d137317715f11d97 jdk-12+25
 50677f43ac3df9a8684222b8893543c60f3aa0bd jdk-13+2
+de9fd809bb475401aad188eab2264226788aad81 jdk-12+26
+642346a11059b9f283110dc301a24ed43b76a94e jdk-13+3
+f15d443f97318e9b40e6f451e327ff69ed4ec361 jdk-12+27
+a47b8125b7cc9ef59619745c163975fe935b57ed jdk-13+4
+659b004b6a1bd8c31e766cbdf328d8f8473fd4d7 jdk-12+28
+
--- a/make/CompileToolsJdk.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/CompileToolsJdk.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -90,7 +90,7 @@
 
 # To be able to call the javascript filter when generating man pages using
 # pandoc, we need to create this executable wrapper script.
-ifneq ($(PANDOC), )
+ifeq ($(ENABLE_PANDOC), true)
   # PANDOC_TROFF_MANPAGE_FILTER is duplicated for export in ToolsJdk.gmk.
   PANDOC_TROFF_MANPAGE_FILTER := \
       $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-troff-manpage-filter
--- a/make/ExplodedImageOptimize.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/ExplodedImageOptimize.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
 ################################################################################
 
 PACKAGES_ATTRIBUTE_TARGET := $(JDK_OUTPUTDIR)/_packages_attribute.done
-ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module_info.class)
+ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
 
 $(PACKAGES_ATTRIBUTE_TARGET): $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES)
 	$(call LogInfo, Optimizing the exploded image)
--- a/make/Main.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/Main.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@@ -484,18 +484,27 @@
   exploded-test-$1:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
 	    TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
-
 endef
 
 # ALL_NAMED_TESTS is defined in FindTests.gmk
 $(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t)))
 ALL_TEST_TARGETS := $(addprefix test-, $(ALL_NAMED_TESTS))
 
+define DeclareRunJCovTestRecipe
+  jcov-test-$1:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \
+	    TEST="$1" TEST_OPTS_JCOV=true)
+endef
+
+# jcov-test only makes sense for some of the tests
+$(foreach t, $(JCOV_NAMED_TESTS), $(eval $(call DeclareRunJCovTestRecipe,$t)))
+ALL_JCOV_TEST_TARGETS := $(addprefix jcov-test-, $(JCOV_NAMED_TESTS))
+
 # We only support the "exploded-test-gtest" shortcut
 ALL_EXPLODED_TESTS := gtest
 ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS))
 
-ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS)
+ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS) $(ALL_JCOV_TEST_TARGETS)
 
 ################################################################################
 # Build tests and microbenchmarks
@@ -568,7 +577,11 @@
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
 	    TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
 
-ALL_TARGETS += test exploded-test
+jcov-test:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk \
+	    TEST="$(TEST)" TEST_OPTS_JCOV=true)
+
+ALL_TARGETS += test exploded-test jcov-test
 
 ################################################################################
 # Bundles
@@ -869,6 +882,8 @@
 
   exploded-test: exploded-image test-image
 
+  jcov-test: jcov-image test-image
+
   test-make: clean-test-make compile-commands
 
   test-make-compile-commands: compile-commands
@@ -876,6 +891,7 @@
   # Declare dependency for all generated test targets
   $(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image))
   $(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image))
+  $(ALL_JCOV_TEST_TARGETS): jcov-image test-image
 
   create-buildjdk-copy: jdk.jlink-java java.base-gendata \
       $(addsuffix -java, $(INTERIM_IMAGE_MODULES))
--- a/make/RunTests.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/RunTests.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -45,7 +45,7 @@
 endif
 
 $(eval $(call ParseKeywordVariable, TEST_OPTS, \
-    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR AOT_MODULES, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR AOT_MODULES JCOV, \
     STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
 ))
 
@@ -595,9 +595,7 @@
 	  $$(eval $1_TOTAL := 1) \
 	)
 
-  $1: run-test-$1 parse-test-$1
-
-  TARGETS += $1
+  TARGETS += run-test-$1 parse-test-$1
 endef
 
 ################################################################################
@@ -702,9 +700,7 @@
 	  $$(eval $1_TOTAL := 1) \
 	)
 
-  $1: run-test-$1 parse-test-$1
-
-  TARGETS += $1
+  TARGETS += run-test-$1 parse-test-$1
 endef
 
 ################################################################################
@@ -879,6 +875,7 @@
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \
+	    $$(JCOV_ENVIRONMENT) \
 	    $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
 	        -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
 	        $$($1_JTREG_BASIC_OPTIONS) \
@@ -888,6 +885,7 @@
 	        -workDir:$$($1_TEST_SUPPORT_DIR) \
 	        $$(JTREG_OPTIONS) \
 	        $$(JTREG_FAILURE_HANDLER_OPTIONS) \
+	        $$(JTREG_JCOV_OPTIONS) \
 	        $$($1_TEST_NAME) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
@@ -921,9 +919,7 @@
 	  $$(eval $1_TOTAL := 1) \
 	)
 
-  $1: run-test-$1 parse-test-$1
-
-  TARGETS += $1
+  TARGETS += run-test-$1 parse-test-$1
 endef
 
 ################################################################################
@@ -985,9 +981,7 @@
 	$$(eval $1_ERROR := 0)
 	$$(eval $1_TOTAL := 0)
 
-  $1: run-test-$1 parse-test-$1
-
-  TARGETS += $1
+  TARGETS += run-test-$1 parse-test-$1
 endef
 
 ################################################################################
@@ -1099,6 +1093,55 @@
 	$(ECHO)
 
 ################################################################################
+# Setup JCov
+################################################################################
+
+ifeq ($(TEST_OPTS_JCOV), true)
+
+  JCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/jcov-output
+  JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log
+  JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml
+  JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report
+  JCOV_MEM_OPTIONS := -Xms64m -Xmx4g
+
+  ifneq ($(JCOV_IMAGE_DIR), )
+    JDK_IMAGE_DIR := $(JCOV_IMAGE_DIR)
+  endif
+
+  JCOV_ENVIRONMENT := JAVA_TOOL_OPTIONS="$(JCOV_MEM_OPTIONS)" \
+      _JAVA_OPTIONS="$(JCOV_MEM_OPTIONS)"
+  JTREG_JCOV_OPTIONS := -e:JAVA_TOOL_OPTIONS='$(JCOV_MEM_OPTIONS)' \
+      -e:_JAVA_OPTIONS='$(JCOV_MEM_OPTIONS)'
+
+  jcov-do-start-grabber:
+	$(call MakeDir, $(JCOV_OUTPUT_DIR))
+	if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \
+	  $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \
+	fi
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
+	    $(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
+	    1>$(JCOV_GRABBER_LOG) 2>&1 &
+
+  jcov-start-grabber: jcov-do-start-grabber
+	$(call LogWarn, Starting JCov Grabber...)
+	$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -t 600 -wait
+
+  jcov-stop-grabber:
+	$(call LogWarn, Stopping JCov Grabber...)
+	$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600
+
+  jcov-gen-report: run-test jcov-stop-grabber
+	$(call LogWarn, Generating JCov report ...)
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
+	    `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
+	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE)
+
+  $(TARGETS): jcov-start-grabber
+  all: jcov-gen-report
+
+endif
+
+################################################################################
 
 all: run-test
 
--- a/make/RunTestsPrebuilt.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/RunTestsPrebuilt.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -237,7 +237,8 @@
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
+          | $(GREP) = | $(SED) 's/\\r//g' \
           | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif
--- a/make/UpdateBuildDocs.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/UpdateBuildDocs.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -34,7 +34,7 @@
 #
 ################################################################################
 
-ifeq ($(PANDOC), )
+ifeq ($(ENABLE_PANDOC), false)
   $(info No pandoc executable was detected by configure)
   $(error Cannot continue)
 endif
--- a/make/autoconf/basics.m4	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/autoconf/basics.m4	Wed Jan 23 16:43:37 2019 -0500
@@ -999,7 +999,7 @@
           elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
             MAKE_EXPECTED_ENV='msys'
           elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
-            MAKE_EXPECTED_ENV='x86_64-pc-linux-gnu'
+            MAKE_EXPECTED_ENV='x86_64-.*-linux-gnu'
           else
             AC_MSG_ERROR([Unknown Windows environment])
           fi
--- a/make/autoconf/flags-cflags.m4	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/autoconf/flags-cflags.m4	Wed Jan 23 16:43:37 2019 -0500
@@ -183,7 +183,8 @@
 
       # Additional warnings that are not activated by -Wall and -Wextra
       WARNINGS_ENABLE_ADDITIONAL="-Wpointer-arith -Wsign-compare \
-          -Wunused-function -Wundef -Wunused-value -Wreturn-type"
+          -Wunused-function -Wundef -Wunused-value -Wreturn-type \
+          -Wtrampolines"
       WARNINGS_ENABLE_ADDITIONAL_CXX="-Woverloaded-virtual -Wreorder"
       WARNINGS_ENABLE_ALL_CFLAGS="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
@@ -526,8 +527,8 @@
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new"
-    TOOLCHAIN_CFLAGS_JDK="-pipe"
+    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new -fstack-protector"
+    TOOLCHAIN_CFLAGS_JDK="-pipe -fstack-protector"
     TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX (but since this gives *worse* performance, use no-strict-aliasing everywhere!)
 
     CXXSTD_CXXFLAG="-std=gnu++98"
@@ -571,10 +572,10 @@
 
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
     # Suggested additions: -qsrcmsg to get improved error reporting
-    TOOLCHAIN_CFLAGS_JDK="-qchars=signed -qfullpath -qsaveopt"  # add on both CFLAGS
+    TOOLCHAIN_CFLAGS_JDK="-qchars=signed -qfullpath -qsaveopt -qstackprotect"  # add on both CFLAGS
     TOOLCHAIN_CFLAGS_JVM="-qtune=balanced \
         -qalias=noansi -qstrict -qtls=default -qlanglvl=c99vla \
-        -qlanglvl=noredefmac -qnortti -qnoeh -qignerrno"
+        -qlanglvl=noredefmac -qnortti -qnoeh -qignerrno -qstackprotect"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     TOOLCHAIN_CFLAGS_JVM="-nologo -MD -MP"
     TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:wchar_t-"
--- a/make/autoconf/hotspot.m4	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/autoconf/hotspot.m4	Wed Jan 23 16:43:37 2019 -0500
@@ -47,8 +47,8 @@
 [ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ])
 
 ###############################################################################
-# Check if the specified JVM features are explicitly enabled. To be used in
-# shell if constructs, like this:
+# Check if the specified JVM feature is enabled. To be used in shell if
+# constructs, like this:
 # if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then
 #
 # Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features.
@@ -59,6 +59,20 @@
 [ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ])
 
 ###############################################################################
+# Check if the specified JVM feature is explicitly disabled. To be used in
+# shell if constructs, like this:
+# if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then
+#
+# This function is internal to hotspot.m4, and is only used when constructing
+# the valid set of enabled JVM features. Users outside of hotspot.m4 should just
+# use HOTSPOT_CHECK_JVM_FEATURE to check if a feature is enabled or not.
+
+# Definition kept in one line to allow inlining in if statements.
+# Additional [] needed to keep m4 from mangling shell constructs.
+AC_DEFUN([HOTSPOT_IS_JVM_FEATURE_DISABLED],
+[ [ [[ " $DISABLED_JVM_FEATURES " =~ " $1 " ]] ] ])
+
+###############################################################################
 # Check which variants of the JVM that we want to build. Available variants are:
 #   server: normal interpreter, and a tiered C1/C2 compiler
 #   client: normal interpreter, and C1 (no C2 compiler)
@@ -373,8 +387,7 @@
 
   AC_MSG_CHECKING([if jvmci module jdk.internal.vm.ci should be built])
   # Check if jvmci is diabled
-  DISABLE_JVMCI=`$ECHO $DISABLED_JVM_FEATURES | $GREP jvmci`
-  if test "x$DISABLE_JVMCI" = "xjvmci"; then
+  if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then
     AC_MSG_RESULT([no, forced])
     JVM_FEATURES_jvmci=""
     INCLUDE_JVMCI="false"
@@ -400,8 +413,7 @@
 
   AC_MSG_CHECKING([if graal module jdk.internal.vm.compiler should be built])
   # Check if graal is diabled
-  DISABLE_GRAAL=`$ECHO $DISABLED_JVM_FEATURES | $GREP graal`
-  if test "x$DISABLE_GRAAL" = "xgraal"; then
+  if HOTSPOT_IS_JVM_FEATURE_DISABLED(graal); then
     AC_MSG_RESULT([no, forced])
     JVM_FEATURES_graal=""
     INCLUDE_GRAAL="false"
@@ -433,8 +445,7 @@
   AC_SUBST(INCLUDE_GRAAL)
 
   # Disable aot with '--with-jvm-features=-aot'
-  DISABLE_AOT=`$ECHO $DISABLED_JVM_FEATURES | $GREP aot`
-  if test "x$DISABLE_AOT" = "xaot"; then
+  if HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then
     ENABLE_AOT="false"
   fi
 
@@ -458,7 +469,7 @@
       JVM_FEATURES_aot="aot"
     fi
   else
-    if test "x$enable_aot" = "xno" || test "x$DISABLE_AOT" = "xaot"; then
+    if test "x$enable_aot" = "xno" || HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then
       AC_MSG_RESULT([no, forced])
     else
       AC_MSG_RESULT([no])
@@ -490,8 +501,7 @@
   fi
 
   # Disable CDS if user requested it with --with-jvm-features=-cds.
-  DISABLE_CDS=`$ECHO $DISABLED_JVM_FEATURES | $GREP cds`
-  if test "x$DISABLE_CDS" = "xcds"; then
+  if HOTSPOT_IS_JVM_FEATURE_DISABLED(cds); then
     ENABLE_CDS="false"
     if test "x$enable_cds" = "xyes"; then
       AC_MSG_ERROR([CDS was disabled by --with-jvm-features=-cds. Remove --enable-cds.])
--- a/make/autoconf/spec.gmk.in	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/autoconf/spec.gmk.in	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@@ -730,6 +730,7 @@
 RC:=@FIXPATH@ @RC@
 DUMPBIN:=@FIXPATH@ @DUMPBIN@
 CYGPATH:=@CYGPATH@
+WSLPATH:=@WSLPATH@
 LDD:=@LDD@
 OTOOL:=@OTOOL@
 READELF:=@READELF@
--- a/make/autoconf/toolchain_windows.m4	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/autoconf/toolchain_windows.m4	Wed Jan 23 16:43:37 2019 -0500
@@ -272,7 +272,26 @@
     eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}"
     eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}"
     eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
-    VS_PATH="$TOOLCHAIN_PATH:$PATH"
+
+    # The TOOLCHAIN_PATH from a devkit is in Unix format. In WSL we need a
+    # windows version of the complete VS_PATH as VS_PATH_WINDOWS
+    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+      # Convert the toolchain path
+      OLDIFS="$IFS"
+      IFS=":"
+      VS_PATH_WINDOWS=""
+      for i in $TOOLCHAIN_PATH; do
+        path=$i
+        BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([path])
+        VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$path"
+      done
+      IFS="$OLDIFS"
+      # Append the current path from Windows env
+      WINDOWS_PATH="`$CMD /c echo %PATH%`"
+      VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$WINDOWS_PATH"
+    else
+      VS_PATH="$TOOLCHAIN_PATH:$PATH"
+    fi
 
     # Convert DEVKIT_VS_INCLUDE into windows style VS_INCLUDE so that it
     # can still be exported as INCLUDE for compiler invocations without
@@ -450,6 +469,34 @@
       . $VS_ENV_TMP_DIR/set-vs-env.sh
       # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
       # also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
+
+      # In WSL, the extracted VS_PATH is Windows style. This needs to be
+      # rewritten as Unix style and the Windows style version is saved
+      # in VS_PATH_WINDOWS.
+      if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+        OLDIFS="$IFS"
+        IFS=";"
+        # Convert VS_PATH to unix style
+        VS_PATH_WINDOWS="$VS_PATH"
+        VS_PATH=""
+        for i in $VS_PATH_WINDOWS; do
+          path=$i
+          # Only process non-empty elements
+          if test "x$path" != x; then
+            IFS="$OLDIFS"
+            # Check that directory exists before calling fixup_path
+            testpath=$path
+            BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+            if test -d "$testpath"; then
+              BASIC_FIXUP_PATH([path])
+              BASIC_APPEND_TO_PATH(VS_PATH, $path)
+            fi
+            IFS=";"
+          fi
+        done
+        IFS="$OLDIFS"
+      fi
+
     else
       # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
       AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment])
@@ -483,29 +530,9 @@
       AC_SUBST(VS_INCLUDE)
       AC_SUBST(VS_LIB)
 
+      # Convert VS_INCLUDE into SYSROOT_CFLAGS
       OLDIFS="$IFS"
       IFS=";"
-      if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
-        # Convert VS_PATH to unix style
-        VS_PATH_WINDOWS="$VS_PATH"
-        VS_PATH=""
-        for i in $VS_PATH_WINDOWS; do
-          path=$i
-          # Only process non-empty elements
-          if test "x$path" != x; then
-            IFS="$OLDIFS"
-            # Check that directory exists before calling fixup_path
-            testpath=$path
-            BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
-            if test -d "$testpath"; then
-              BASIC_FIXUP_PATH([path])
-              BASIC_APPEND_TO_PATH(VS_PATH, $path)
-            fi
-            IFS=";"
-          fi
-        done
-      fi
-      # Convert VS_INCLUDE into SYSROOT_CFLAGS
       for i in $VS_INCLUDE; do
         ipath=$i
         # Only process non-empty elements
--- a/make/common/FindTests.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/common/FindTests.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -68,6 +68,7 @@
 # Add Jtreg test groups to list of named tests (test groups, test list, etc)
 # ALL_NAMED_TESTS might have been set by a custom extension
 ALL_NAMED_TESTS += $(JTREG_TEST_GROUPS)
+JCOV_NAMED_TESTS += $(JTREG_TEST_GROUPS)
 
 # Add Gtest
 ALL_NAMED_TESTS += gtest
--- a/make/conf/jib-profiles.js	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/conf/jib-profiles.js	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -386,7 +386,9 @@
             target_cpu: "x64",
             dependencies: ["devkit", "graphviz", "pandoc", "graalunit_lib"],
             configure_args: concat(common.configure_args_64bit,
-                "--enable-full-docs", "--with-zlib=system"),
+                "--enable-full-docs", "--with-zlib=system",
+                (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
+                    "--build=x86_64-unknown-linux-gnu" ] : [])),
             default_make_targets: ["docs-bundles"],
         },
 
@@ -572,6 +574,20 @@
             profiles[bootcyclePrebuiltName].default_make_targets = [ "product-images" ];
         });
 
+    // JCov profiles build JCov-instrumented JDK image based on images provided through dependencies.
+    [ "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
+        .forEach(function (name) {
+            var jcovName = name + "-jcov";
+            profiles[jcovName] = clone(common.main_profile_base);
+            profiles[jcovName].target_os = profiles[name].target_os
+            profiles[jcovName].target_cpu = profiles[name].target_cpu
+            profiles[jcovName].default_make_targets = [ "jcov-bundles" ];
+            profiles[jcovName].dependencies = concat(profiles[jcovName].dependencies,
+                [ name + ".jdk", "devkit" ]);
+            profiles[jcovName].configure_args = concat(profiles[jcovName].configure_args,
+                ["--with-jcov-input-jdk=" + input.get(name + ".jdk", "home_path")]);
+        });
+
     //
     // Define artifacts for profiles
     //
@@ -705,6 +721,26 @@
         });
     });
 
+    // Artifacts of JCov profiles
+    [ "linux-x64", "macosx-x64", "solaris-sparcv9", "windows-x64"]
+        .forEach(function (name) {
+            var o = artifactData[name]
+            var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
+            var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
+            var pf = o.platform
+            var jcovName = name + "-jcov";
+            profiles[jcovName].artifacts = {
+                jdk: {
+                    local: "bundles/\\(jdk-jcov.*bin." + jdk_suffix + "\\)",
+                    remote: [
+                        "bundles/" + pf + "/jdk-jcov-" + data.version + "_" + pf + "_bin." + jdk_suffix
+                    ],
+                    subdir: jdk_subdir,
+                    exploded: "images/jdk-jcov"
+                }
+            };
+        });
+
     // Profiles used to run tests.
     var testOnlyProfiles = {
         "run-test": {
@@ -833,6 +869,13 @@
 
     var boot_jdk_platform = (input.build_os == "macosx" ? "osx" : input.build_os)
         + "-" + input.build_cpu;
+    var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz")
+    // If running in WSL and building for Windows, it will look like Linux,
+    // but we need a Windows boot JDK.
+    if (isWsl(input) && input.target_os == "windows") {
+        boot_jdk_platform = "windows-" + input.build_cpu;
+        boot_jdk_ext = ".zip";
+    }
 
     var makeBinDir = (input.build_os == "windows"
         ? input.get("gnumake", "install_path") + "/cygwin/bin"
@@ -846,8 +889,7 @@
             version: common.boot_jdk_version,
             build_number: "28",
             file: "bundles/" + boot_jdk_platform + "/jdk-" + common.boot_jdk_version + "_"
-                + boot_jdk_platform + "_bin"
-		+ (input.build_os == "windows" ? ".zip" : ".tar.gz"),
+                + boot_jdk_platform + "_bin" + boot_jdk_ext,
             configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
             environment_path: common.boot_jdk_home + "/bin"
         },
@@ -941,7 +983,7 @@
             organization: common.organization,
             ext: "tar.gz",
             revision: "2.3.1+1.0",
-            module: "pandoc-" + input.target_platform,
+            module: "pandoc-" + input.build_platform,
             configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc",
             environment_path: input.get("pandoc", "install_path") + "/pandoc"
         },
@@ -1181,3 +1223,13 @@
     }
     return version_numbers;
 }
+
+/**
+ * Returns true if running in Windows Subsystem for Linux. Jib does not yet
+ * detect wsl as osenv, so fall back on linux with version containing Microsoft.
+ */
+var isWsl = function (input) {
+    return ( input.build_osenv == "wsl"
+             || (input.build_os == "linux"
+                 && java.lang.System.getProperty("os.version").contains("Microsoft")));
+}
--- a/make/devkit/createWindowsDevkit2017.sh	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/devkit/createWindowsDevkit2017.sh	Wed Jan 23 16:43:37 2019 -0500
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, 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
@@ -25,7 +25,7 @@
 #
 
 # This script copies parts of a Visual Studio installation into a devkit
-# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin.
+# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin or WSL.
 # erik.joelsson@oracle.com
 
 VS_VERSION="2017"
@@ -34,6 +34,8 @@
 SDK_VERSION="10"
 SDK_FULL_VERSION="10.0.16299.0"
 MSVC_DIR="Microsoft.VC141.CRT"
+MSVC_FULL_VERSION="14.12.25827"
+REDIST_FULL_VERSION="14.12.25810"
 
 SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
 BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
@@ -41,22 +43,42 @@
 ################################################################################
 # Prepare settings
 
+UNAME_SYSTEM=`uname -s`
+UNAME_RELEASE=`uname -r`
+
+# Detect cygwin or WSL
+IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
+IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
+if test "x$IS_CYGWIN" != "x"; then
+    BUILD_ENV="cygwin"
+elif test "x$IS_WSL" != "x"; then
+    BUILD_ENV="wsl"
+else
+    echo "Unknown environment; only Cygwin and WSL are supported."
+    exit 1
+fi
+
+if test "x$BUILD_ENV" = "xcygwin"; then
+    WINDOWS_PATH_TO_UNIX_PATH="cygpath -u"
+elif test "x$BUILD_ENV" = "xwsl"; then
+    WINDOWS_PATH_TO_UNIX_PATH="wslpath -u"
+fi
+
 # Work around the insanely named ProgramFiles(x86) env variable
-PROGRAMFILES_X86="$(cygpath "$(env | sed -n 's/^ProgramFiles(x86)=//p')")"
+PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
 
 # Find Visual Studio installation dir
-eval VSNNNCOMNTOOLS="\"\${VS${VS_VERSION_NUM_NODOT}COMNTOOLS}\""
+VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
 if [ -d "$VSNNNCOMNTOOLS" ]; then
-    VS_INSTALL_DIR="$(cygpath "$VSNNNCOMNTOOLS/../..")"
+    VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
 else
     VS_INSTALL_DIR="${PROGRAMFILES_X86}/Microsoft Visual Studio/2017"
-    VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional} 2>/dev/null | head -n1)"
-    VS_INSTALL_DIR="$(cygpath "$VS_INSTALL_DIR")"
+    VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
 fi
 echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
 
 # Extract semantic version
-POTENTIAL_INI_FILES="Common7\IDE\wdexpress.isolation.ini Common7\IDE\devenv.isolation.ini"
+POTENTIAL_INI_FILES="Common7/IDE/wdexpress.isolation.ini Common7/IDE/devenv.isolation.ini"
 for f in $POTENTIAL_INI_FILES; do
     if [ -f "$VS_INSTALL_DIR/$f" ]; then
         VS_VERSION_SP="$(grep ^SemanticVersion= "$VS_INSTALL_DIR/$f")"
@@ -86,8 +108,8 @@
 # Copy Visual Studio files
 
 if [ ! -d $DEVKIT_ROOT/VC ]; then
-    VC_SUBDIR="VC/Tools/MSVC/14.12.25827"
-    REDIST_SUBDIR="VC/Redist/MSVC/14.12.25810"
+    VC_SUBDIR="VC/Tools/MSVC/$MSVC_FULL_VERSION"
+    REDIST_SUBDIR="VC/Redist/MSVC/$REDIST_FULL_VERSION"
     echo "Copying VC..."
     mkdir -p $DEVKIT_ROOT/VC/bin
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/x64" $DEVKIT_ROOT/VC/bin/
@@ -117,7 +139,7 @@
 ################################################################################
 # Copy SDK files
 
-SDK_INSTALL_DIR="$(cygpath "$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION")"
+SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
 echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
 
 if [ ! -d $DEVKIT_ROOT/$SDK_VERSION ]; then
--- a/make/hotspot/ide/CreateVSProject.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/hotspot/ide/CreateVSProject.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -46,8 +46,17 @@
 
   # Helper macro to convert a unix path to a Windows path, suitable for
   # inclusion in a command line.
-  FixPath = \
-    $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1)))
+  ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin)
+    FixPath = \
+        $(strip $(subst \,\\,$(shell $(CYGPATH) -w $1)))
+    FixLinuxExecutable = \
+        $(call FixPath, $1)
+  else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.wsl)
+    FixPath = \
+        $(strip $(subst \,\\,$(shell $(WSLPATH) -w $1)))
+    FixLinuxExecutable = \
+        "%windir%\Sysnative\wsl.exe $1"
+  endif
 
   JVM_DEFINES_client := $(patsubst -D%,%, $(filter -D%, $(JVM_CFLAGS)))
   EXTRACTED_DEFINES_client := $(addprefix -define , $(JVM_DEFINES_client))
@@ -121,7 +130,7 @@
       -platformName x64 \
       -buildBase $(call FixPath, $(IDE_OUTPUTDIR)/vs-output) \
       -buildSpace $(call FixPath, $(IDE_OUTPUTDIR)) \
-      -makeBinary $(call FixPath, $(MAKE)) \
+      -makeBinary $(call FixLinuxExecutable, $(MAKE)) \
       -makeOutput $(call FixPath, $(JDK_OUTPUTDIR)/bin/server) \
       -absoluteInclude $(call FixPath, $(HOTSPOT_OUTPUTDIR)/variant-server/gensrc) \
       -absoluteSrcInclude $(call FixPath, $(HOTSPOT_OUTPUTDIR)/variant-server/gensrc) \
--- a/make/hotspot/symbols/symbols-unix	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/hotspot/symbols/symbols-unix	Wed Jan 23 16:43:37 2019 -0500
@@ -81,7 +81,6 @@
 JVM_GetClassInterfaces
 JVM_GetClassMethodsCount
 JVM_GetClassModifiers
-JVM_GetClassName
 JVM_GetClassNameUTF
 JVM_GetClassSignature
 JVM_GetClassSigners
@@ -135,6 +134,7 @@
 JVM_HasReferencePendingList
 JVM_HoldsLock
 JVM_IHashCode
+JVM_InitClassName
 JVM_InitStackTraceElement
 JVM_InitStackTraceElementArray
 JVM_InitializeFromArchive
--- a/make/lib/Awt2dLibraries.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/lib/Awt2dLibraries.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@@ -519,7 +519,7 @@
       DISABLED_WARNINGS_solstudio := \
          E_STATEMENT_NOT_REACHED \
          E_END_OF_LOOP_CODE_NOT_REACHED, \
-      DISABLED_WARNINGS_microsoft := 4267 4244 4312, \
+      DISABLED_WARNINGS_microsoft := 4267 4244 4312 4819, \
       DISABLED_WARNINGS_gcc := implicit-fallthrough, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
--- a/make/lib/Lib-java.base.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/lib/Lib-java.base.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -56,7 +56,7 @@
     LIBS_solaris := -lnsl -lsocket $(LIBDL), \
     LIBS_aix := $(LIBDL),\
     LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \
-        delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \
+        urlmon.lib delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \
     LIBS_macosx := -framework CoreFoundation -framework CoreServices, \
 ))
 
--- a/make/lib/Lib-jdk.hotspot.agent.gmk	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk	Wed Jan 23 16:43:37 2019 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, 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
@@ -66,7 +66,7 @@
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
     EXTRA_SRC := $(LIBSA_EXTRA_SRC), \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
-    LIBS_linux := -lthread_db $(LIBDL), \
+    LIBS_linux := $(LIBDL), \
     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
     LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
         -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
--- a/make/nb_native/nbproject/configurations.xml	Thu Jan 03 21:25:54 2019 +0100
+++ b/make/nb_native/nbproject/configurations.xml	Wed Jan 23 16:43:37 2019 -0500
@@ -2,6711 +2,6 @@
 <configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="../.." name="0">
-      <df name="bin">
-        <in>unshuffle_list.txt</in>
-      </df>
-      <df name="build">
-        <df name="hotspot">
-          <df name="linux_amd64_compiler2">
-            <df name="generated">
-              <df name="adfiles">
-                <in>ad_x86_64.cpp</in>
-                <in>ad_x86_64_clone.cpp</in>
-                <in>ad_x86_64_expand.cpp</in>
-                <in>ad_x86_64_format.cpp</in>
-                <in>ad_x86_64_gen.cpp</in>
-                <in>ad_x86_64_misc.cpp</in>
-                <in>ad_x86_64_peephole.cpp</in>
-                <in>ad_x86_64_pipeline.cpp</in>
-                <in>dfa_x86_64.cpp</in>
-              </df>
-              <df name="jvmtifiles">
-                <in>bytecodeInterpreterWithChecks.cpp</in>
-                <in>jvmtiEnter.cpp</in>
-                <in>jvmtiEnterTrace.cpp</in>
-              </df>
-            </df>
-          </df>
-          <df name="variant-server">
-            <df name="gensrc">
-              <df name="adfiles">
-                <in>ad_x86_64.cpp</in>
-                <in>ad_x86_64_clone.cpp</in>
-                <in>ad_x86_64_expand.cpp</in>
-                <in>ad_x86_64_format.cpp</in>
-                <in>ad_x86_64_gen.cpp</in>
-                <in>ad_x86_64_misc.cpp</in>
-                <in>ad_x86_64_peephole.cpp</in>
-                <in>ad_x86_64_pipeline.cpp</in>
-                <in>dfa_x86_64.cpp</in>
-              </df>
-              <df name="jvmtifiles">
-                <in>bytecodeInterpreterWithChecks.cpp</in>
-                <in>jvmtiEnter.cpp</in>
-                <in>jvmtiEnterTrace.cpp</in>
-              </df>
-            </df>
-            <df name="support">
-              <df name="dtrace">
-                <in>JvmOffsets.cpp</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="macosx-x86_64-normal-server-release">
-          <df name="hotspot">
-            <df name="variant-server">
-              <df name="gensrc">
-                <df name="adfiles">
-                  <in>ad_x86_64.cpp</in>
-                  <in>ad_x86_64_clone.cpp</in>
-                  <in>ad_x86_64_expand.cpp</in>
-                  <in>ad_x86_64_format.cpp</in>
-                  <in>ad_x86_64_gen.cpp</in>
-                  <in>ad_x86_64_misc.cpp</in>
-                  <in>ad_x86_64_peephole.cpp</in>
-                  <in>ad_x86_64_pipeline.cpp</in>
-                  <in>dfa_x86_64.cpp</in>
-                </df>
-                <df name="jvmtifiles">
-                  <in>bytecodeInterpreterWithChecks.cpp</in>
-                  <in>jvmtiEnter.cpp</in>
-                  <in>jvmtiEnterTrace.cpp</in>
-                </df>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="support">
-          <df name="gensrc">
-            <df name="java.desktop">
-              <df name="_x11wrappers">
-                <in>sizer.64.c</in>
-              </df>
-            </df>
-          </df>
-        </df>
-      </df>
-      <df name="make">
-        <df name="data">
-          <df name="charsetmapping">
-            <in>Big5.map</in>
-            <in>Big5_HKSCS.map</in>
-            <in>Big5_Solaris.map</in>
-            <in>EUC_CN.map</in>
-            <in>EUC_JP.map</in>
-            <in>EUC_JP_LINUX.map</in>
-            <in>EUC_JP_Open.map</in>
-            <in>EUC_KR.map</in>
-            <in>EUC_TW.map</in>
-            <in>GB18030.map</in>
-            <in>GBK.map</in>
-            <in>HKSCS2001.map</in>
-            <in>HKSCS2008.map</in>
-            <in>HKSCS_XP.map</in>
-            <in>IBM037.map</in>
-            <in>IBM1006.map</in>
-            <in>IBM1025.map</in>
-            <in>IBM1026.map</in>
-            <in>IBM1046.map</in>
-            <in>IBM1047.map</in>
-            <in>IBM1097.map</in>
-            <in>IBM1098.map</in>
-            <in>IBM1112.map</in>
-            <in>IBM1122.map</in>
-            <in>IBM1123.map</in>
-            <in>IBM1124.map</in>
-            <in>IBM1129.map</in>
-            <in>IBM1140.map</in>
-            <in>IBM1141.map</in>
-            <in>IBM1142.map</in>
-            <in>IBM1143.map</in>
-            <in>IBM1144.map</in>
-            <in>IBM1145.map</in>
-            <in>IBM1146.map</in>
-            <in>IBM1147.map</in>
-            <in>IBM1148.map</in>
-            <in>IBM1149.map</in>
-            <in>IBM1166.map</in>
-            <in>IBM1364.map</in>
-            <in>IBM1381.map</in>
-            <in>IBM1383.map</in>
-            <in>IBM273.map</in>
-            <in>IBM277.map</in>
-            <in>IBM278.map</in>
-            <in>IBM280.map</in>
-            <in>IBM284.map</in>
-            <in>IBM285.map</in>
-            <in>IBM290.map</in>
-            <in>IBM297.map</in>
-            <in>IBM300.map</in>
-            <in>IBM420.map</in>
-            <in>IBM424.map</in>
-            <in>IBM437.map</in>
-            <in>IBM500.map</in>
-            <in>IBM737.map</in>
-            <in>IBM775.map</in>
-            <in>IBM833.map</in>
-            <in>IBM838.map</in>
-            <in>IBM850.map</in>
-            <in>IBM852.map</in>
-            <in>IBM855.map</in>
-            <in>IBM856.map</in>
-            <in>IBM857.map</in>
-            <in>IBM858.map</in>
-            <in>IBM860.map</in>
-            <in>IBM861.map</in>
-            <in>IBM862.map</in>
-            <in>IBM863.map</in>
-            <in>IBM864.map</in>
-            <in>IBM865.map</in>
-            <in>IBM866.map</in>
-            <in>IBM868.map</in>
-            <in>IBM869.map</in>
-            <in>IBM870.map</in>
-            <in>IBM871.map</in>
-            <in>IBM874.map</in>
-            <in>IBM875.map</in>
-            <in>IBM918.map</in>
-            <in>IBM921.map</in>
-            <in>IBM922.map</in>
-            <in>IBM930.map</in>
-            <in>IBM933.map</in>
-            <in>IBM935.map</in>
-            <in>IBM937.map</in>
-            <in>IBM939.map</in>
-            <in>IBM942.map</in>
-            <in>IBM943.map</in>
-            <in>IBM948.map</in>
-            <in>IBM949.map</in>
-            <in>IBM950.map</in>
-            <in>IBM970.map</in>
-            <in>ISO_8859_11.map</in>
-            <in>ISO_8859_13.map</in>
-            <in>ISO_8859_15.map</in>
-            <in>ISO_8859_16.map</in>
-            <in>ISO_8859_2.map</in>
-            <in>ISO_8859_3.map</in>
-            <in>ISO_8859_4.map</in>
-            <in>ISO_8859_5.map</in>
-            <in>ISO_8859_6.map</in>
-            <in>ISO_8859_7.map</in>
-            <in>ISO_8859_8.map</in>
-            <in>ISO_8859_9.map</in>
-            <in>JIS_X_0201.map</in>
-            <in>JIS_X_0208.map</in>
-            <in>JIS_X_0208_MS5022X.map</in>
-            <in>JIS_X_0208_MS932.map</in>
-            <in>JIS_X_0208_Solaris.map</in>
-            <in>JIS_X_0212.map</in>
-            <in>JIS_X_0212_MS5022X.map</in>
-            <in>JIS_X_0212_Solaris.map</in>
-            <in>Johab.map</in>
-            <in>KOI8_R.map</in>
-            <in>KOI8_U.map</in>
-            <in>MS1250.map</in>
-            <in>MS1251.map</in>
-            <in>MS1252.map</in>
-            <in>MS1253.map</in>
-            <in>MS1254.map</in>
-            <in>MS1255.map</in>
-            <in>MS1256.map</in>
-            <in>MS1257.map</in>
-            <in>MS1258.map</in>
-            <in>MS874.map</in>
-            <in>MS932.map</in>
-            <in>MS936.map</in>
-            <in>MS949.map</in>
-            <in>MS950.map</in>
-            <in>MS950_HKSCS_XP.map</in>
-            <in>MacArabic.map</in>
-            <in>MacCentralEurope.map</in>
-            <in>MacCroatian.map</in>
-            <in>MacCyrillic.map</in>
-            <in>MacDingbat.map</in>
-            <in>MacGreek.map</in>
-            <in>MacHebrew.map</in>
-            <in>MacIceland.map</in>
-            <in>MacRoman.map</in>
-            <in>MacRomania.map</in>
-            <in>MacSymbol.map</in>
-            <in>MacThai.map</in>
-            <in>MacTurkish.map</in>
-            <in>MacUkraine.map</in>
-            <in>PCK.map</in>
-            <in>SJIS.map</in>
-            <in>TIS_620.map</in>
-            <in>sjis0213.map</in>
-          </df>
-          <df name="dtdbuilder">
-            <in>public.map</in>
-          </df>
-          <df name="lsrdata">
-            <in>language-subtag-registry.txt</in>
-          </df>
-          <df name="symbols">
-            <in>java.activation-6.sym.txt</in>
-            <in>java.activation-7.sym.txt</in>
-            <in>java.activation-8.sym.txt</in>
-            <in>java.annotations.common-6.sym.txt</in>
-            <in>java.annotations.common-7.sym.txt</in>
-            <in>java.annotations.common-8.sym.txt</in>
-            <in>java.base-6.sym.txt</in>
-            <in>java.base-7.sym.txt</in>
-            <in>java.base-8.sym.txt</in>
-            <in>java.compiler-6.sym.txt</in>
-            <in>java.compiler-7.sym.txt</in>
-            <in>java.compiler-8.sym.txt</in>
-            <in>java.corba-6.sym.txt</in>
-            <in>java.corba-7.sym.txt</in>
-            <in>java.corba-8.sym.txt</in>
-            <in>java.datatransfer-6.sym.txt</in>
-            <in>java.datatransfer-7.sym.txt</in>
-            <in>java.datatransfer-8.sym.txt</in>
-            <in>java.desktop-6.sym.txt</in>
-            <in>java.desktop-7.sym.txt</in>
-            <in>java.desktop-8.sym.txt</in>
-            <in>java.instrument-6.sym.txt</in>
-            <in>java.instrument-7.sym.txt</in>
-            <in>java.instrument-8.sym.txt</in>
-            <in>java.logging-6.sym.txt</in>
-            <in>java.logging-7.sym.txt</in>
-            <in>java.logging-8.sym.txt</in>
-            <in>java.management-6.sym.txt</in>
-            <in>java.management-7.sym.txt</in>
-            <in>java.management-8.sym.txt</in>
-            <in>java.naming-6.sym.txt</in>
-            <in>java.naming-7.sym.txt</in>
-            <in>java.naming-8.sym.txt</in>
-            <in>java.prefs-6.sym.txt</in>
-            <in>java.prefs-7.sym.txt</in>
-            <in>java.prefs-8.sym.txt</in>
-            <in>java.rmi-6.sym.txt</in>
-            <in>java.rmi-7.sym.txt</in>
-            <in>java.rmi-8.sym.txt</in>
-            <in>java.scripting-6.sym.txt</in>
-            <in>java.scripting-7.sym.txt</in>
-            <in>java.scripting-8.sym.txt</in>
-            <in>java.security.jgss-6.sym.txt</in>
-            <in>java.security.jgss-7.sym.txt</in>
-            <in>java.security.jgss-8.sym.txt</in>
-            <in>java.security.sasl-6.sym.txt</in>
-            <in>java.security.sasl-7.sym.txt</in>
-            <in>java.security.sasl-8.sym.txt</in>
-            <in>java.sql-6.sym.txt</in>
-            <in>java.sql-7.sym.txt</in>
-            <in>java.sql-8.sym.txt</in>
-            <in>java.sql.rowset-6.sym.txt</in>
-            <in>java.sql.rowset-7.sym.txt</in>
-            <in>java.sql.rowset-8.sym.txt</in>
-            <in>java.transaction-6.sym.txt</in>
-            <in>java.transaction-7.sym.txt</in>
-            <in>java.transaction-8.sym.txt</in>
-            <in>java.xml-6.sym.txt</in>
-            <in>java.xml-7.sym.txt</in>
-            <in>java.xml-8.sym.txt</in>
-            <in>java.xml.bind-6.sym.txt</in>
-            <in>java.xml.bind-7.sym.txt</in>
-            <in>java.xml.bind-8.sym.txt</in>
-            <in>java.xml.crypto-6.sym.txt</in>
-            <in>java.xml.crypto-7.sym.txt</in>
-            <in>java.xml.crypto-8.sym.txt</in>
-            <in>java.xml.ws-6.sym.txt</in>
-            <in>java.xml.ws-7.sym.txt</in>
-            <in>java.xml.ws-8.sym.txt</in>
-            <in>jdk.httpserver-6.sym.txt</in>
-            <in>jdk.httpserver-7.sym.txt</in>
-            <in>jdk.httpserver-8.sym.txt</in>
-            <in>jdk.management-6.sym.txt</in>
-            <in>jdk.management-7.sym.txt</in>
-            <in>jdk.management-8.sym.txt</in>
-            <in>jdk.scripting.nashorn-6.sym.txt</in>
-            <in>jdk.scripting.nashorn-7.sym.txt</in>
-            <in>jdk.scripting.nashorn-8.sym.txt</in>
-            <in>jdk.sctp-6.sym.txt</in>
-            <in>jdk.sctp-7.sym.txt</in>
-            <in>jdk.sctp-8.sym.txt</in>
-            <in>jdk.security.auth-6.sym.txt</in>
-            <in>jdk.security.auth-7.sym.txt</in>
-            <in>jdk.security.auth-8.sym.txt</in>
-            <in>jdk.security.jgss-6.sym.txt</in>
-            <in>jdk.security.jgss-7.sym.txt</in>
-            <in>jdk.security.jgss-8.sym.txt</in>
-          </df>
-          <df name="unicodedata">
-            <in>PropList.txt</in>
-            <in>Scripts.txt</in>
-            <in>SpecialCasing.txt</in>
-            <in>UnicodeData.txt</in>
-          </df>
-          <df name="x11wrappergen">
-            <in>functions.txt</in>
-            <in>xlibtypes.txt</in>
-          </df>
-        </df>
-        <df name="devkit">
-          <in>solaris11.1-package-list.txt</in>
-        </df>
-        <df name="hotspot">
-          <df name="src">
-            <df name="native">
-              <df name="dtrace">
-                <in>generateJvmOffsets.cpp</in>
-                <in>generateJvmOffsets.h</in>
-                <in>generateJvmOffsetsMain.c</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="langtools">
-          <df name="test">
-            <df name="lib">
-              <in>classes.gold.txt</in>
-              <in>src.gold.txt</in>
-            </df>
-            <in>HelloWorld.apt.gold.txt</in>
-            <in>HelloWorld.gold.h</in>
-            <in>HelloWorld.javadoc.gold.txt</in>
-            <in>HelloWorld.javap.gold.txt</in>
-            <in>contents.gold.txt</in>
-          </df>
-        </df>
-        <df name="nashorn">
-          <df name="exclude">
-            <in>exclude_list.txt</in>
-            <in>exclude_list_cc.txt</in>
-          </df>
-        </df>
-        <df name="src">
-          <df name="native">
-            <in>fixpath.c</in>
-          </df>
-        </df>
-      </df>
-      <df name="src">
-        <df name="demo">
-          <df name="share">
-            <df name="java2d">
-              <df name="J2DBench">
-                <df name="resources">
-                  <df name="textdata">
-                    <in>arabic.ut8.txt</in>
-                    <in>english.ut8.txt</in>
-                    <in>greek.ut8.txt</in>
-                    <in>hebrew.ut8.txt</in>
-                    <in>hindi.ut8.txt</in>
-                    <in>japanese.ut8.txt</in>
-                    <in>korean.ut8.txt</in>
-                    <in>thai.ut8.txt</in>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="jfc">
-              <df name="FileChooserDemo">
-                <in>README.txt</in>
-              </df>
-              <df name="Font2DTest">
-                <in>README.txt</in>
-              </df>
-              <df name="Metalworks">
-                <in>README.txt</in>
-              </df>
-              <df name="Notepad">
-                <in>README.txt</in>
-              </df>
-              <df name="SampleTree">
-                <in>README.txt</in>
-              </df>
-              <df name="SwingApplet">
-                <in>README.txt</in>
-              </df>
-              <df name="TableExample">
-                <in>README.txt</in>
-              </df>
-              <df name="TransparentRuler">
-                <in>README.txt</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="hotspot">
-          <df name="cpu">
-            <df name="aarch64">
-              <in>aarch64.ad</in>
-              <in>aarch64Test.cpp</in>
-              <in>aarch64_call.cpp</in>
-              <in>aarch64_linkage.S</in>
-              <in>abstractInterpreter_aarch64.cpp</in>
-              <in>assembler_aarch64.cpp</in>
-              <in>assembler_aarch64.hpp</in>
-              <in>assembler_aarch64.inline.hpp</in>
-              <in>bytecodes_aarch64.cpp</in>
-              <in>bytecodes_aarch64.hpp</in>
-              <in>bytes_aarch64.hpp</in>
-              <in>c1_CodeStubs_aarch64.cpp</in>
-              <in>c1_Defs_aarch64.hpp</in>
-              <in>c1_FpuStackSim_aarch64.cpp</in>
-              <in>c1_FpuStackSim_aarch64.hpp</in>
-              <in>c1_FrameMap_aarch64.cpp</in>
-              <in>c1_FrameMap_aarch64.hpp</in>
-              <in>c1_LIRAssembler_aarch64.cpp</in>
-              <in>c1_LIRAssembler_aarch64.hpp</in>
-              <in>c1_LIRGenerator_aarch64.cpp</in>
-              <in>c1_LIR_aarch64.cpp</in>
-              <in>c1_LinearScan_aarch64.cpp</in>
-              <in>c1_LinearScan_aarch64.hpp</in>
-              <in>c1_MacroAssembler_aarch64.cpp</in>
-              <in>c1_MacroAssembler_aarch64.hpp</in>
-              <in>c1_Runtime1_aarch64.cpp</in>
-              <in>c1_globals_aarch64.hpp</in>
-              <in>c2_globals_aarch64.hpp</in>
-              <in>c2_init_aarch64.cpp</in>
-              <in>codeBuffer_aarch64.hpp</in>
-              <in>compiledIC_aarch64.cpp</in>
-              <in>copy_aarch64.hpp</in>
-              <in>cpustate_aarch64.hpp</in>
-              <in>decode_aarch64.hpp</in>
-              <in>depChecker_aarch64.cpp</in>
-              <in>depChecker_aarch64.hpp</in>
-              <in>disassembler_aarch64.hpp</in>
-              <in>frame_aarch64.cpp</in>
-              <in>frame_aarch64.hpp</in>
-              <in>frame_aarch64.inline.hpp</in>
-              <in>globalDefinitions_aarch64.hpp</in>
-              <in>globals_aarch64.hpp</in>
-              <in>icBuffer_aarch64.cpp</in>
-              <in>icache_aarch64.cpp</in>
-              <in>icache_aarch64.hpp</in>
-              <in>immediate_aarch64.cpp</in>
-              <in>immediate_aarch64.hpp</in>
-              <in>interp_masm_aarch64.cpp</in>
-              <in>interp_masm_aarch64.hpp</in>
-              <in>interpreterRT_aarch64.cpp</in>
-              <in>interpreterRT_aarch64.hpp</in>
-              <in>javaFrameAnchor_aarch64.hpp</in>
-              <in>jniFastGetField_aarch64.cpp</in>
-              <in>jniTypes_aarch64.hpp</in>
-              <in>jni_aarch64.h</in>
-              <in>jvmciCodeInstaller_aarch64.cpp</in>
-              <in>macroAssembler_aarch64.cpp</in>
-              <in>macroAssembler_aarch64.hpp</in>
-              <in>macroAssembler_aarch64.inline.hpp</in>
-              <in>methodHandles_aarch64.cpp</in>
-              <in>methodHandles_aarch64.hpp</in>
-              <in>nativeInst_aarch64.cpp</in>
-              <in>nativeInst_aarch64.hpp</in>
-              <in>registerMap_aarch64.hpp</in>
-              <in>register_aarch64.cpp</in>
-              <in>register_aarch64.hpp</in>
-              <in>register_definitions_aarch64.cpp</in>
-              <in>relocInfo_aarch64.cpp</in>
-              <in>relocInfo_aarch64.hpp</in>
-              <in>runtime_aarch64.cpp</in>
-              <in>sharedRuntime_aarch64.cpp</in>
-              <in>stubGenerator_aarch64.cpp</in>
-              <in>stubRoutines_aarch64.cpp</in>
-              <in>stubRoutines_aarch64.hpp</in>
-              <in>templateInterpreterGenerator_aarch64.cpp</in>
-              <in>templateTable_aarch64.cpp</in>
-              <in>templateTable_aarch64.hpp</in>
-              <in>vmStructs_aarch64.hpp</in>
-              <in>vm_version_aarch64.cpp</in>
-              <in>vm_version_aarch64.hpp</in>
-              <in>vmreg_aarch64.cpp</in>
-              <in>vmreg_aarch64.hpp</in>
-              <in>vmreg_aarch64.inline.hpp</in>
-              <in>vtableStubs_aarch64.cpp</in>
-            </df>
-            <df name="arm">
-              <in>abstractInterpreter_arm.cpp</in>
-              <in>arm.ad</in>
-              <in>arm_32.ad</in>
-              <in>arm_64.ad</in>
-              <in>assembler_arm.cpp</in>
-              <in>assembler_arm.hpp</in>
-              <in>assembler_arm.inline.hpp</in>
-              <in>assembler_arm_32.cpp</in>
-              <in>assembler_arm_32.hpp</in>
-              <in>assembler_arm_64.cpp</in>
-              <in>assembler_arm_64.hpp</in>
-              <in>bytes_arm.hpp</in>
-              <in>c1_CodeStubs_arm.cpp</in>
-              <in>c1_Defs_arm.hpp</in>
-              <in>c1_FpuStackSim_arm.cpp</in>
-              <in>c1_FpuStackSim_arm.hpp</in>
-              <in>c1_FrameMap_arm.cpp</in>
-              <in>c1_FrameMap_arm.hpp</in>
-              <in>c1_LIRAssembler_arm.cpp</in>
-              <in>c1_LIRAssembler_arm.hpp</in>
-              <in>c1_LIRGenerator_arm.cpp</in>
-              <in>c1_LIRGenerator_arm.hpp</in>
-              <in>c1_LIR_arm.cpp</in>
-              <in>c1_LinearScan_arm.cpp</in>
-              <in>c1_LinearScan_arm.hpp</in>
-              <in>c1_MacroAssembler_arm.cpp</in>
-              <in>c1_MacroAssembler_arm.hpp</in>
-              <in>c1_Runtime1_arm.cpp</in>
-              <in>c1_globals_arm.hpp</in>
-              <in>c2_globals_arm.hpp</in>
-              <in>codeBuffer_arm.hpp</in>
-              <in>compiledIC_arm.cpp</in>
-              <in>copy_arm.hpp</in>
-              <in>depChecker_arm.cpp</in>
-              <in>depChecker_arm.hpp</in>
-              <in>disassembler_arm.hpp</in>
-              <in>frame_arm.cpp</in>
-              <in>frame_arm.hpp</in>
-              <in>frame_arm.inline.hpp</in>
-              <in>globalDefinitions_arm.hpp</in>
-              <in>globals_arm.hpp</in>
-              <in>icBuffer_arm.cpp</in>
-              <in>icache_arm.cpp</in>
-              <in>icache_arm.hpp</in>
-              <in>interp_masm_arm.cpp</in>
-              <in>interp_masm_arm.hpp</in>
-              <in>interpreterRT_arm.cpp</in>
-              <in>interpreterRT_arm.hpp</in>
-              <in>javaFrameAnchor_arm.hpp</in>
-              <in>jniFastGetField_arm.cpp</in>
-              <in>jniTypes_arm.hpp</in>
-              <in>jni_arm.h</in>
-              <in>jvmciCodeInstaller_arm.cpp</in>
-              <in>macroAssembler_arm.cpp</in>
-              <in>macroAssembler_arm.hpp</in>
-              <in>macroAssembler_arm.inline.hpp</in>
-              <in>methodHandles_arm.cpp</in>
-              <in>methodHandles_arm.hpp</in>
-              <in>nativeInst_arm.hpp</in>
-              <in>nativeInst_arm_32.cpp</in>
-              <in>nativeInst_arm_32.hpp</in>
-              <in>nativeInst_arm_64.cpp</in>
-              <in>nativeInst_arm_64.hpp</in>
-              <in>registerMap_arm.hpp</in>
-              <in>register_arm.cpp</in>
-              <in>register_arm.hpp</in>
-              <in>register_definitions_arm.cpp</in>
-              <in>relocInfo_arm.cpp</in>
-              <in>relocInfo_arm.hpp</in>
-              <in>runtime_arm.cpp</in>
-              <in>sharedRuntime_arm.cpp</in>
-              <in>stubGenerator_arm.cpp</in>
-              <in>stubRoutinesCrypto_arm.cpp</in>
-              <in>stubRoutines_arm.cpp</in>
-              <in>stubRoutines_arm.hpp</in>
-              <in>templateInterpreterGenerator_arm.cpp</in>
-              <in>templateTable_arm.cpp</in>
-              <in>templateTable_arm.hpp</in>
-              <in>vmStructs_arm.hpp</in>
-              <in>vm_version_arm.hpp</in>
-              <in>vm_version_arm_32.cpp</in>
-              <in>vm_version_arm_64.cpp</in>
-              <in>vmreg_arm.cpp</in>
-              <in>vmreg_arm.hpp</in>
-              <in>vmreg_arm.inline.hpp</in>
-              <in>vtableStubs_arm.cpp</in>
-            </df>
-            <df name="ppc">
-              <in>abstractInterpreter_ppc.cpp</in>
-              <in>assembler_ppc.cpp</in>
-              <in>assembler_ppc.hpp</in>
-              <in>assembler_ppc.inline.hpp</in>
-              <in>bytes_ppc.hpp</in>
-              <in>c1_CodeStubs_ppc.cpp</in>
-              <in>c1_Defs_ppc.hpp</in>
-              <in>c1_FpuStackSim_ppc.hpp</in>
-              <in>c1_FrameMap_ppc.cpp</in>
-              <in>c1_FrameMap_ppc.hpp</in>
-              <in>c1_LIRAssembler_ppc.cpp</in>
-              <in>c1_LIRAssembler_ppc.hpp</in>
-              <in>c1_LIRGenerator_ppc.cpp</in>
-              <in>c1_LIR_ppc.cpp</in>
-              <in>c1_LinearScan_ppc.cpp</in>
-              <in>c1_LinearScan_ppc.hpp</in>
-              <in>c1_MacroAssembler_ppc.cpp</in>
-              <in>c1_MacroAssembler_ppc.hpp</in>
-              <in>c1_Runtime1_ppc.cpp</in>
-              <in>c1_globals_ppc.hpp</in>
-              <in>c2_globals_ppc.hpp</in>
-              <in>c2_init_ppc.cpp</in>
-              <in>codeBuffer_ppc.hpp</in>
-              <in>compiledIC_ppc.cpp</in>
-              <in>copy_ppc.hpp</in>
-              <in>depChecker_ppc.hpp</in>
-              <in>disassembler_ppc.hpp</in>
-              <in>frame_ppc.cpp</in>
-              <in>frame_ppc.hpp</in>
-              <in>frame_ppc.inline.hpp</in>
-              <in>globalDefinitions_ppc.hpp</in>
-              <in>globals_ppc.hpp</in>
-              <in>icBuffer_ppc.cpp</in>
-              <in>icache_ppc.cpp</in>
-              <in>icache_ppc.hpp</in>
-              <in>interp_masm_ppc.hpp</in>
-              <in>interp_masm_ppc_64.cpp</in>
-              <in>interpreterRT_ppc.cpp</in>
-              <in>interpreterRT_ppc.hpp</in>
-              <in>javaFrameAnchor_ppc.hpp</in>
-              <in>jniFastGetField_ppc.cpp</in>
-              <in>jniTypes_ppc.hpp</in>
-              <in>jni_ppc.h</in>
-              <in>jvmciCodeInstaller_ppc.cpp</in>
-              <in>macroAssembler_ppc.cpp</in>
-              <in>macroAssembler_ppc.hpp</in>
-              <in>macroAssembler_ppc.inline.hpp</in>
-              <in>macroAssembler_ppc_sha.cpp</in>
-              <in>methodHandles_ppc.cpp</in>
-              <in>methodHandles_ppc.hpp</in>
-              <in>nativeInst_ppc.cpp</in>
-              <in>nativeInst_ppc.hpp</in>
-              <in>ppc.ad</in>
-              <in>registerMap_ppc.hpp</in>
-              <in>register_definitions_ppc.cpp</in>
-              <in>register_ppc.cpp</in>
-              <in>register_ppc.hpp</in>
-              <in>relocInfo_ppc.cpp</in>
-              <in>relocInfo_ppc.hpp</in>
-              <in>runtime_ppc.cpp</in>
-              <in>sharedRuntime_ppc.cpp</in>
-              <in>stubGenerator_ppc.cpp</in>
-              <in>stubRoutines_ppc.hpp</in>
-              <in>stubRoutines_ppc_64.cpp</in>
-              <in>templateInterpreterGenerator_ppc.cpp</in>
-              <in>templateTable_ppc.hpp</in>
-              <in>templateTable_ppc_64.cpp</in>
-              <in>vmStructs_ppc.hpp</in>
-              <in>vm_version_ppc.cpp</in>
-              <in>vm_version_ppc.hpp</in>
-              <in>vmreg_ppc.cpp</in>
-              <in>vmreg_ppc.hpp</in>
-              <in>vmreg_ppc.inline.hpp</in>
-              <in>vtableStubs_ppc_64.cpp</in>
-            </df>
-            <df name="s390">
-              <in>abstractInterpreter_s390.cpp</in>
-              <in>assembler_s390.cpp</in>
-              <in>assembler_s390.hpp</in>
-              <in>assembler_s390.inline.hpp</in>
-              <in>bytes_s390.hpp</in>
-              <in>c1_CodeStubs_s390.cpp</in>
-              <in>c1_Defs_s390.hpp</in>
-              <in>c1_FpuStackSim_s390.hpp</in>
-              <in>c1_FrameMap_s390.cpp</in>
-              <in>c1_FrameMap_s390.hpp</in>
-              <in>c1_LIRAssembler_s390.cpp</in>
-              <in>c1_LIRAssembler_s390.hpp</in>
-              <in>c1_LIRGenerator_s390.cpp</in>
-              <in>c1_LIR_s390.cpp</in>
-              <in>c1_LinearScan_s390.cpp</in>
-              <in>c1_LinearScan_s390.hpp</in>
-              <in>c1_MacroAssembler_s390.cpp</in>
-              <in>c1_MacroAssembler_s390.hpp</in>
-              <in>c1_Runtime1_s390.cpp</in>
-              <in>c1_globals_s390.hpp</in>
-              <in>c2_globals_s390.hpp</in>
-              <in>c2_init_s390.cpp</in>
-              <in>codeBuffer_s390.hpp</in>
-              <in>compiledIC_s390.cpp</in>
-              <in>copy_s390.hpp</in>
-              <in>depChecker_s390.hpp</in>
-              <in>disassembler_s390.hpp</in>
-              <in>frame_s390.cpp</in>
-              <in>frame_s390.hpp</in>
-              <in>frame_s390.inline.hpp</in>
-              <in>globalDefinitions_s390.hpp</in>
-              <in>globals_s390.hpp</in>
-              <in>icBuffer_s390.cpp</in>
-              <in>icache_s390.cpp</in>
-              <in>icache_s390.hpp</in>
-              <in>interp_masm_s390.cpp</in>
-              <in>interp_masm_s390.hpp</in>
-              <in>interpreterRT_s390.cpp</in>
-              <in>interpreterRT_s390.hpp</in>
-              <in>javaFrameAnchor_s390.hpp</in>
-              <in>jniFastGetField_s390.cpp</in>
-              <in>jniTypes_s390.hpp</in>
-              <in>jni_s390.h</in>
-              <in>jvmciCodeInstaller_s390.cpp</in>
-              <in>macroAssembler_s390.cpp</in>
-              <in>macroAssembler_s390.hpp</in>
-              <in>macroAssembler_s390.inline.hpp</in>
-              <in>methodHandles_s390.cpp</in>
-              <in>methodHandles_s390.hpp</in>
-              <in>nativeInst_s390.cpp</in>
-              <in>nativeInst_s390.hpp</in>
-              <in>registerMap_s390.hpp</in>
-              <in>registerSaver_s390.hpp</in>
-              <in>register_definitions_s390.cpp</in>
-              <in>register_s390.cpp</in>
-              <in>register_s390.hpp</in>
-              <in>relocInfo_s390.cpp</in>
-              <in>relocInfo_s390.hpp</in>
-              <in>runtime_s390.cpp</in>
-              <in>s390.ad</in>
-              <in>sharedRuntime_s390.cpp</in>
-              <in>stubGenerator_s390.cpp</in>
-              <in>stubRoutines_s390.cpp</in>
-              <in>stubRoutines_s390.hpp</in>
-              <in>templateInterpreterGenerator_s390.cpp</in>
-              <in>templateTable_s390.cpp</in>
-              <in>templateTable_s390.hpp</in>
-              <in>vmStructs_s390.hpp</in>
-              <in>vm_version_s390.cpp</in>
-              <in>vm_version_s390.hpp</in>
-              <in>vmreg_s390.cpp</in>
-              <in>vmreg_s390.hpp</in>
-              <in>vmreg_s390.inline.hpp</in>
-              <in>vtableStubs_s390.cpp</in>
-            </df>
-            <df name="sparc">
-              <in>abstractInterpreter_sparc.cpp</in>
-              <in>args.cc</in>
-              <in>assembler_sparc.cpp</in>
-              <in>assembler_sparc.hpp</in>
-              <in>assembler_sparc.inline.hpp</in>
-              <in>bytes_sparc.hpp</in>
-              <in>c1_CodeStubs_sparc.cpp</in>
-              <in>c1_Defs_sparc.hpp</in>
-              <in>c1_FpuStackSim_sparc.cpp</in>
-              <in>c1_FpuStackSim_sparc.hpp</in>
-              <in>c1_FrameMap_sparc.cpp</in>
-              <in>c1_FrameMap_sparc.hpp</in>
-              <in>c1_LIRAssembler_sparc.cpp</in>
-              <in>c1_LIRAssembler_sparc.hpp</in>
-              <in>c1_LIRGenerator_sparc.cpp</in>
-              <in>c1_LIR_sparc.cpp</in>
-              <in>c1_LinearScan_sparc.cpp</in>
-              <in>c1_LinearScan_sparc.hpp</in>
-              <in>c1_MacroAssembler_sparc.cpp</in>
-              <in>c1_MacroAssembler_sparc.hpp</in>
-              <in>c1_Runtime1_sparc.cpp</in>
-              <in>c1_globals_sparc.hpp</in>
-              <in>c2_globals_sparc.hpp</in>
-              <in>c2_init_sparc.cpp</in>
-              <in>codeBuffer_sparc.hpp</in>
-              <in>compiledIC_sparc.cpp</in>
-              <in>copy_sparc.hpp</in>
-              <in>depChecker_sparc.cpp</in>
-              <in>depChecker_sparc.hpp</in>
-              <in>disassembler_sparc.hpp</in>
-              <in>frame_sparc.cpp</in>
-              <in>frame_sparc.hpp</in>
-              <in>frame_sparc.inline.hpp</in>
-              <in>globalDefinitions_sparc.hpp</in>
-              <in>globals_sparc.hpp</in>
-              <in>icBuffer_sparc.cpp</in>
-              <in>icache_sparc.cpp</in>
-              <in>icache_sparc.hpp</in>
-              <in>interp_masm_sparc.cpp</in>
-              <in>interp_masm_sparc.hpp</in>
-              <in>interpreterRT_sparc.cpp</in>
-              <in>interpreterRT_sparc.hpp</in>
-              <in>javaFrameAnchor_sparc.hpp</in>
-              <in>jniFastGetField_sparc.cpp</in>
-              <in>jniTypes_sparc.hpp</in>
-              <in>jni_sparc.h</in>
-              <in>jvmciCodeInstaller_sparc.cpp</in>
-              <in>macroAssembler_sparc.cpp</in>
-              <in>macroAssembler_sparc.hpp</in>
-              <in>macroAssembler_sparc.inline.hpp</in>
-              <in>memset_with_concurrent_readers_sparc.cpp</in>
-              <in>methodHandles_sparc.cpp</in>
-              <in>methodHandles_sparc.hpp</in>
-              <in>nativeInst_sparc.cpp</in>
-              <in>nativeInst_sparc.hpp</in>
-              <in>registerMap_sparc.hpp</in>
-              <in>register_definitions_sparc.cpp</in>
-              <in>register_sparc.cpp</in>
-              <in>register_sparc.hpp</in>
-              <in>relocInfo_sparc.cpp</in>
-              <in>relocInfo_sparc.hpp</in>
-              <in>runtime_sparc.cpp</in>
-              <in>sharedRuntime_sparc.cpp</in>
-              <in>sparc.ad</in>
-              <in>stubGenerator_sparc.cpp</in>
-              <in>stubRoutines_sparc.cpp</in>
-              <in>stubRoutines_sparc.hpp</in>
-              <in>templateInterpreterGenerator_sparc.cpp</in>
-              <in>templateTable_sparc.cpp</in>
-              <in>templateTable_sparc.hpp</in>
-              <in>vmStructs_sparc.hpp</in>
-              <in>vm_version_sparc.cpp</in>
-              <in>vm_version_sparc.hpp</in>
-              <in>vmreg_sparc.cpp</in>
-              <in>vmreg_sparc.hpp</in>
-              <in>vmreg_sparc.inline.hpp</in>
-              <in>vtableStubs_sparc.cpp</in>
-            </df>
-            <df name="x86">
-              <in>abstractInterpreter_x86.cpp</in>
-              <in>assembler_x86.cpp</in>
-              <in>assembler_x86.hpp</in>
-              <in>assembler_x86.inline.hpp</in>
-              <in>bytes_x86.hpp</in>
-              <in>c1_CodeStubs_x86.cpp</in>
-              <in>c1_Defs_x86.hpp</in>
-              <in>c1_FpuStackSim_x86.cpp</in>
-              <in>c1_FpuStackSim_x86.hpp</in>
-              <in>c1_FrameMap_x86.cpp</in>
-              <in>c1_FrameMap_x86.hpp</in>
-              <in>c1_LIRAssembler_x86.cpp</in>
-              <in>c1_LIRAssembler_x86.hpp</in>
-              <in>c1_LIRGenerator_x86.cpp</in>
-              <in>c1_LIR_x86.cpp</in>
-              <in>c1_LinearScan_x86.cpp</in>
-              <in>c1_LinearScan_x86.hpp</in>
-              <in>c1_MacroAssembler_x86.cpp</in>
-              <in>c1_MacroAssembler_x86.hpp</in>
-              <in>c1_Runtime1_x86.cpp</in>
-              <in>c1_globals_x86.hpp</in>
-              <in>c2_globals_x86.hpp</in>
-              <in>c2_init_x86.cpp</in>
-              <in>codeBuffer_x86.hpp</in>
-              <in>compiledIC_aot_x86_64.cpp</in>
-              <in>compiledIC_x86.cpp</in>
-              <in>copy_x86.hpp</in>
-              <in>crc32c.h</in>
-              <in>depChecker_x86.cpp</in>
-              <in>depChecker_x86.hpp</in>
-              <in>disassembler_x86.hpp</in>
-              <in>frame_x86.cpp</in>
-              <in>frame_x86.hpp</in>
-              <in>frame_x86.inline.hpp</in>
-              <in>globalDefinitions_x86.hpp</in>
-              <in>globals_x86.hpp</in>
-              <in>icBuffer_x86.cpp</in>
-              <in>icache_x86.cpp</in>
-              <in>icache_x86.hpp</in>
-              <in>interp_masm_x86.cpp</in>
-              <in>interp_masm_x86.hpp</in>
-              <in>interpreterRT_x86.hpp</in>
-              <in>interpreterRT_x86_32.cpp</in>
-              <in>interpreterRT_x86_64.cpp</in>
-              <in>javaFrameAnchor_x86.hpp</in>
-              <in>jniFastGetField_x86_32.cpp</in>
-              <in>jniFastGetField_x86_64.cpp</in>
-              <in>jniTypes_x86.hpp</in>
-              <in>jni_x86.h</in>
-              <in>jvmciCodeInstaller_x86.cpp</in>
-              <in>macroAssembler_x86.cpp</in>
-              <in>macroAssembler_x86.hpp</in>
-              <in>macroAssembler_x86.inline.hpp</in>
-              <in>macroAssembler_x86_cos.cpp</in>
-              <in>macroAssembler_x86_exp.cpp</in>
-              <in>macroAssembler_x86_log.cpp</in>
-              <in>macroAssembler_x86_log10.cpp</in>
-              <in>macroAssembler_x86_pow.cpp</in>
-              <in>macroAssembler_x86_sha.cpp</in>
-              <in>macroAssembler_x86_sin.cpp</in>
-              <in>macroAssembler_x86_tan.cpp</in>
-              <in>methodHandles_x86.cpp</in>
-              <in>methodHandles_x86.hpp</in>
-              <in>nativeInst_x86.cpp</in>