--- jsr166/build.xml	2016/04/18 15:30:49	1.210
+++ jsr166/build.xml	2016/05/21 00:12:12	1.211
@@ -252,7 +252,7 @@
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
       <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+      <compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -263,7 +263,7 @@
           jvm="${java@{target}}"
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+	<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
 	<jvmarg line="@{jvmflags}"/>
 
         <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
@@ -333,7 +333,7 @@
            reportDir="@{workdir}/JTreport">
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+      <arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
       <arg value="-agentvm"/>
       <arg value="-verbose:${jtreg.verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>