# HG changeset patch
# User alanb
# Date 1462268340 -3600
# Node ID 3a06bcd89461b8d62b5c2f283333c783f270f7c3
# Parent  82b8d12a553f5617737c238cec060281d52e351c# Parent  09fa0c82a5f7137ec04a6b1a5b6c272ad92dff6c
Merge

diff -r 82b8d12a553f -r 3a06bcd89461 nashorn/make/BuildNashorn.gmk
--- a/nashorn/make/BuildNashorn.gmk	Wed Jul 05 21:39:33 2017 +0200
+++ b/nashorn/make/BuildNashorn.gmk	Tue May 03 10:39:00 2016 +0100
@@ -76,9 +76,10 @@
 ifeq ($(BOOT_JDK_MODULAR), true)
   NASGEN_OPTIONS := \
       -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
-      -Xpatch:$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
+      -Xpatch:java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
       -XaddExports:java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
-      -XaddExports:java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED
+      -XaddExports:java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
+      #
 else
   NASGEN_OPTIONS := \
       -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes
diff -r 82b8d12a553f -r 3a06bcd89461 nashorn/test/TEST.ROOT
--- a/nashorn/test/TEST.ROOT	Wed Jul 05 21:39:33 2017 +0200
+++ b/nashorn/test/TEST.ROOT	Tue May 03 10:39:00 2016 +0100
@@ -8,4 +8,4 @@
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=4.2 b01
+requiredVersion=4.2 b02