# HG changeset patch
# User mgronlun
# Date 1447764614 -3600
#      Tue Nov 17 13:50:14 2015 +0100
# Node ID e452cc5ea183f4db155514a5ae6201e83ef70c95
# Parent  93f2a16f683dd52cbe08ab3aa277535db13473ee
[mq]: jdk_top_level

diff --git a/common/bin/compare_exceptions.sh.incl b/common/bin/compare_exceptions.sh.incl
--- a/common/bin/compare_exceptions.sh.incl
+++ b/common/bin/compare_exceptions.sh.incl
@@ -231,7 +231,6 @@
 ./lib/amd64/libjava.so
 ./lib/amd64/libjawt.so
 ./lib/amd64/libjdwp.so
-./lib/amd64/libjfr.so
 ./lib/amd64/libjpeg.so
 ./lib/amd64/libjsdt.so
 ./lib/amd64/libjsound.so
@@ -364,7 +363,6 @@
 ./lib/sparcv9/libjava.so
 ./lib/sparcv9/libjawt.so
 ./lib/sparcv9/libjdwp.so
-./lib/sparcv9/libjfr.so
 ./lib/sparcv9/libjpeg.so
 ./lib/sparcv9/libjsdt.so
 ./lib/sparcv9/libjsound.so
diff --git a/modules.xml b/modules.xml
--- a/modules.xml
+++ b/modules.xml
@@ -236,6 +236,22 @@
       <to>jdk.scripting.nashorn</to>
     </export>
     <export>
+      <name>jdk.internal.org.xml.sax</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
+      <name>jdk.internal.org.xml.sax.helpers</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
+      <name>jdk.internal.util.xml</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
+      <name>jdk.internal.util.xml.impl</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
       <name>jdk.internal.org.objectweb.asm</name>
       <to>java.instrument</to>
       <to>jdk.jfr</to>
@@ -287,6 +303,7 @@
       <to>jdk.httpserver</to>
       <to>jdk.jartool</to>
       <to>jdk.jconsole</to>
+      <to>jdk.jfr</to>
       <to>jdk.jvmstat</to>
       <to>jdk.management.resource</to>
       <to>jdk.pack200</to>
@@ -869,6 +886,7 @@
       <name>sun.management.spi</name>
       <to>jdk.management</to>
       <to>jdk.management.cmm</to>
+      <to>jdk.management.jfr</to>
     </export>
   </module>
   <module>