< prev index next >

make/nb_native/nbproject/configurations.xml

Print this page

        

@@ -1,3025 +1,1198 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="linux-x86_64-server-slowdebug">
           <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>
+                  <in>ad_x86.cpp</in>
+                  <in>ad_x86_clone.cpp</in>
+                  <in>ad_x86_expand.cpp</in>
+                  <in>ad_x86_format.cpp</in>
+                  <in>ad_x86_gen.cpp</in>
+                  <in>ad_x86_misc.cpp</in>
+                  <in>ad_x86_peephole.cpp</in>
+                  <in>ad_x86_pipeline.cpp</in>
+                  <in>dfa_x86.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 name="hotspot">
+          <df name="cpu">
+            <df name="x86">
+              <df name="gc">
+                <df name="g1">
+                  <in>g1BarrierSetAssembler_x86.cpp</in>
             </df>
+                <df name="shared">
+                  <in>barrierSetAssembler_x86.cpp</in>
+                  <in>barrierSetNMethod_x86.cpp</in>
+                  <in>cardTableBarrierSetAssembler_x86.cpp</in>
+                  <in>modRefBarrierSetAssembler_x86.cpp</in>
+                </df>
+                <df name="shenandoah">
+                  <in>shenandoahBarrierSetAssembler_x86.cpp</in>
+                  <in>shenandoahBarrierSetC1_x86.cpp</in>
           </df>
+                <df name="z">
+                  <in>zBarrierSetAssembler_x86.cpp</in>
         </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_aes.cpp</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>
-              <in>nativeInst_x86.hpp</in>
+              <in>rdtsc_x86.cpp</in>
               <in>registerMap_x86.cpp</in>
-              <in>registerMap_x86.hpp</in>
               <in>register_definitions_x86.cpp</in>
               <in>register_x86.cpp</in>
-              <in>register_x86.hpp</in>
               <in>relocInfo_x86.cpp</in>
-              <in>relocInfo_x86.hpp</in>
-              <in>runtime_x86_32.cpp</in>
               <in>runtime_x86_64.cpp</in>
               <in>sharedRuntime_x86.cpp</in>
-              <in>sharedRuntime_x86_32.cpp</in>
               <in>sharedRuntime_x86_64.cpp</in>
-              <in>stubGenerator_x86_32.cpp</in>
               <in>stubGenerator_x86_64.cpp</in>
               <in>stubRoutines_x86.cpp</in>
-              <in>stubRoutines_x86.hpp</in>
-              <in>stubRoutines_x86_32.cpp</in>
               <in>stubRoutines_x86_64.cpp</in>
               <in>templateInterpreterGenerator_x86.cpp</in>
-              <in>templateInterpreterGenerator_x86_32.cpp</in>
               <in>templateInterpreterGenerator_x86_64.cpp</in>
               <in>templateTable_x86.cpp</in>
-              <in>templateTable_x86.hpp</in>
-              <in>vmStructs_x86.hpp</in>
+              <in>vm_version_ext_x86.cpp</in>
               <in>vm_version_x86.cpp</in>
-              <in>vm_version_x86.hpp</in>
               <in>vmreg_x86.cpp</in>
-              <in>vmreg_x86.hpp</in>
-              <in>vmreg_x86.inline.hpp</in>
-              <in>vtableStubs_x86_32.cpp</in>
               <in>vtableStubs_x86_64.cpp</in>
-              <in>x86.ad</in>
-              <in>x86_32.ad</in>
-              <in>x86_64.ad</in>
-            </df>
-            <df name="zero">
-              <in>abstractInterpreter_zero.cpp</in>
-              <in>assembler_zero.cpp</in>
-              <in>assembler_zero.hpp</in>
-              <in>assembler_zero.inline.hpp</in>
-              <in>bytecodeInterpreter_zero.cpp</in>
-              <in>bytecodeInterpreter_zero.hpp</in>
-              <in>bytecodeInterpreter_zero.inline.hpp</in>
-              <in>bytes_zero.hpp</in>
-              <in>codeBuffer_zero.hpp</in>
-              <in>compiledIC_zero.cpp</in>
-              <in>copy_zero.hpp</in>
-              <in>cppInterpreterGenerator_zero.cpp</in>
-              <in>cppInterpreter_zero.cpp</in>
-              <in>cppInterpreter_zero.hpp</in>
-              <in>depChecker_zero.cpp</in>
-              <in>depChecker_zero.hpp</in>
-              <in>disassembler_zero.cpp</in>
-              <in>disassembler_zero.hpp</in>
-              <in>entryFrame_zero.hpp</in>
-              <in>entry_zero.hpp</in>
-              <in>fakeStubFrame_zero.hpp</in>
-              <in>frame_zero.cpp</in>
-              <in>frame_zero.hpp</in>
-              <in>frame_zero.inline.hpp</in>
-              <in>globalDefinitions_zero.hpp</in>
-              <in>globals_zero.hpp</in>
-              <in>icBuffer_zero.cpp</in>
-              <in>icache_zero.cpp</in>
-              <in>icache_zero.hpp</in>
-              <in>interp_masm_zero.hpp</in>
-              <in>interpreterFrame_zero.hpp</in>
-              <in>interpreterRT_zero.cpp</in>
-              <in>interpreterRT_zero.hpp</in>
-              <in>javaFrameAnchor_zero.hpp</in>
-              <in>jniFastGetField_zero.cpp</in>
-              <in>jniTypes_zero.hpp</in>
-              <in>jni_zero.h</in>
-              <in>macroAssembler_zero.hpp</in>
-              <in>macroAssembler_zero.inline.hpp</in>
-              <in>methodHandles_zero.cpp</in>
-              <in>methodHandles_zero.hpp</in>
-              <in>nativeInst_zero.cpp</in>
-              <in>nativeInst_zero.hpp</in>
-              <in>registerMap_zero.hpp</in>
-              <in>register_zero.cpp</in>
-              <in>register_zero.hpp</in>
-              <in>relocInfo_zero.cpp</in>
-              <in>relocInfo_zero.hpp</in>
-              <in>sharedRuntime_zero.cpp</in>
-              <in>sharkFrame_zero.hpp</in>
-              <in>shark_globals_zero.hpp</in>
-              <in>stack_zero.cpp</in>
-              <in>stack_zero.hpp</in>
-              <in>stack_zero.inline.hpp</in>
-              <in>stubGenerator_zero.cpp</in>
-              <in>stubRoutines_zero.cpp</in>
-              <in>stubRoutines_zero.hpp</in>
-              <in>vmStructs_zero.hpp</in>
-              <in>vm_version_zero.cpp</in>
-              <in>vm_version_zero.hpp</in>
-              <in>vmreg_zero.cpp</in>
-              <in>vmreg_zero.hpp</in>
-              <in>vmreg_zero.inline.hpp</in>
-              <in>vtableStubs_zero.cpp</in>
             </df>
           </df>
           <df name="os">
-            <df name="aix">
-              <in>attachListener_aix.cpp</in>
-              <in>c1_globals_aix.hpp</in>
-              <in>c2_globals_aix.hpp</in>
-              <in>decoder_aix.hpp</in>
-              <in>globals_aix.hpp</in>
-              <in>jvm_aix.cpp</in>
-              <in>jvm_aix.h</in>
-              <in>libo4.cpp</in>
-              <in>libo4.hpp</in>
-              <in>libodm_aix.cpp</in>
-              <in>libodm_aix.hpp</in>
-              <in>libperfstat_aix.cpp</in>
-              <in>libperfstat_aix.hpp</in>
-              <in>loadlib_aix.cpp</in>
-              <in>loadlib_aix.hpp</in>
-              <in>misc_aix.cpp</in>
-              <in>misc_aix.hpp</in>
-              <in>osThread_aix.cpp</in>
-              <in>osThread_aix.hpp</in>
-              <in>os_aix.cpp</in>
-              <in>os_aix.hpp</in>
-              <in>os_aix.inline.hpp</in>
-              <in>os_share_aix.hpp</in>
-              <in>perfMemory_aix.cpp</in>
-              <in>porting_aix.cpp</in>
-              <in>porting_aix.hpp</in>
-              <in>threadCritical_aix.cpp</in>
-              <in>vmStructs_aix.hpp</in>
-            </df>
-            <df name="bsd">
-              <in>attachListener_bsd.cpp</in>
-              <in>c1_globals_bsd.hpp</in>
-              <in>c2_globals_bsd.hpp</in>
-              <in>decoder_machO.cpp</in>
-              <in>decoder_machO.hpp</in>
-              <in>globals_bsd.hpp</in>
-              <in>jvm_bsd.cpp</in>
-              <in>jvm_bsd.h</in>
-              <in>osThread_bsd.cpp</in>
-              <in>osThread_bsd.hpp</in>
-              <in>os_bsd.cpp</in>
-              <in>os_bsd.hpp</in>
-              <in>os_bsd.inline.hpp</in>
-              <in>os_share_bsd.hpp</in>
-              <in>perfMemory_bsd.cpp</in>
-              <in>semaphore_bsd.hpp</in>
-              <in>threadCritical_bsd.cpp</in>
-              <in>vmStructs_bsd.hpp</in>
-            </df>
             <df name="linux">
               <in>attachListener_linux.cpp</in>
-              <in>c1_globals_linux.hpp</in>
-              <in>c2_globals_linux.hpp</in>
               <in>decoder_linux.cpp</in>
-              <in>globals_linux.hpp</in>
-              <in>jvm_linux.cpp</in>
-              <in>jvm_linux.h</in>
+              <in>osContainer_linux.cpp</in>
               <in>osThread_linux.cpp</in>
-              <in>osThread_linux.hpp</in>
               <in>os_linux.cpp</in>
-              <in>os_linux.hpp</in>
-              <in>os_linux.inline.hpp</in>
-              <in>os_share_linux.hpp</in>
+              <in>os_perf_linux.cpp</in>
               <in>perfMemory_linux.cpp</in>
               <in>threadCritical_linux.cpp</in>
-              <in>vmStructs_linux.hpp</in>
             </df>
             <df name="posix">
+              <in>jvm_posix.cpp</in>
               <in>os_posix.cpp</in>
-              <in>os_posix.hpp</in>
-              <in>semaphore_posix.hpp</in>
+              <in>semaphore_posix.cpp</in>
               <in>threadLocalStorage_posix.cpp</in>
               <in>vmError_posix.cpp</in>
             </df>
-            <df name="solaris">
-              <in>attachListener_solaris.cpp</in>
-              <in>c1_globals_solaris.hpp</in>
-              <in>c2_globals_solaris.hpp</in>
-              <in>decoder_solaris.cpp</in>
-              <in>globals_solaris.hpp</in>
-              <in>jvm_solaris.cpp</in>
-              <in>jvm_solaris.h</in>
-              <in>osThread_solaris.cpp</in>
-              <in>osThread_solaris.hpp</in>
-              <in>os_share_solaris.hpp</in>
-              <in>os_solaris.cpp</in>
-              <in>os_solaris.hpp</in>
-              <in>os_solaris.inline.hpp</in>
-              <in>perfMemory_solaris.cpp</in>
-              <in>threadCritical_solaris.cpp</in>
-              <in>vmStructs_solaris.hpp</in>
-            </df>
-            <df name="windows">
-              <in>attachListener_windows.cpp</in>
-              <in>c1_globals_windows.hpp</in>
-              <in>c2_globals_windows.hpp</in>
-              <in>decoder_windows.cpp</in>
-              <in>decoder_windows.hpp</in>
-              <in>globals_windows.hpp</in>
-              <in>jvm_windows.cpp</in>
-              <in>jvm_windows.h</in>
-              <in>osThread_windows.cpp</in>
-              <in>osThread_windows.hpp</in>
-              <in>os_share_windows.hpp</in>
-              <in>os_windows.cpp</in>
-              <in>os_windows.hpp</in>
-              <in>os_windows.inline.hpp</in>
-              <in>perfMemory_windows.cpp</in>
-              <in>semaphore_windows.hpp</in>
-              <in>sharedRuntimeRem.cpp</in>
-              <in>threadCritical_windows.cpp</in>
-              <in>threadLocalStorage_windows.cpp</in>
-              <in>vmError_windows.cpp</in>
-              <in>vmStructs_windows.hpp</in>
-              <in>windbghelp.cpp</in>
-              <in>windbghelp.hpp</in>
-            </df>
           </df>
           <df name="os_cpu">
-            <df name="aix_ppc">
-              <in>atomic_aix_ppc.hpp</in>
-              <in>bytes_aix_ppc.inline.hpp</in>
-              <in>globals_aix_ppc.hpp</in>
-              <in>orderAccess_aix_ppc.inline.hpp</in>
-              <in>os_aix_ppc.cpp</in>
-              <in>os_aix_ppc.hpp</in>
-              <in>prefetch_aix_ppc.inline.hpp</in>
-              <in>thread_aix_ppc.cpp</in>
-              <in>thread_aix_ppc.hpp</in>
-              <in>vmStructs_aix_ppc.hpp</in>
-            </df>
-            <df name="bsd_x86">
-              <in>assembler_bsd_x86.cpp</in>
-              <in>atomic_bsd_x86.hpp</in>
-              <in>bsd_x86_32.s</in>
-              <in>bsd_x86_64.s</in>
-              <in>bytes_bsd_x86.inline.hpp</in>
-              <in>copy_bsd_x86.inline.hpp</in>
-              <in>globals_bsd_x86.hpp</in>
-              <in>orderAccess_bsd_x86.inline.hpp</in>
-              <in>os_bsd_x86.cpp</in>
-              <in>os_bsd_x86.hpp</in>
-              <in>os_bsd_x86.inline.hpp</in>
-              <in>prefetch_bsd_x86.inline.hpp</in>
-              <in>thread_bsd_x86.cpp</in>
-              <in>thread_bsd_x86.hpp</in>
-              <in>vmStructs_bsd_x86.hpp</in>
-              <in>vm_version_bsd_x86.cpp</in>
-            </df>
-            <df name="bsd_zero">
-              <in>assembler_bsd_zero.cpp</in>
-              <in>atomic_bsd_zero.hpp</in>
-              <in>bytes_bsd_zero.inline.hpp</in>
-              <in>globals_bsd_zero.hpp</in>
-              <in>orderAccess_bsd_zero.inline.hpp</in>
-              <in>os_bsd_zero.cpp</in>
-              <in>os_bsd_zero.hpp</in>
-              <in>prefetch_bsd_zero.inline.hpp</in>
-              <in>thread_bsd_zero.cpp</in>
-              <in>thread_bsd_zero.hpp</in>
-              <in>vmStructs_bsd_zero.hpp</in>
-              <in>vm_version_bsd_zero.cpp</in>
-            </df>
-            <df name="linux_aarch64">
-              <in>assembler_linux_aarch64.cpp</in>
-              <in>atomic_linux_aarch64.hpp</in>
-              <in>bytes_linux_aarch64.inline.hpp</in>
-              <in>copy_linux_aarch64.inline.hpp</in>
-              <in>copy_linux_aarch64.s</in>
-              <in>globals_linux_aarch64.hpp</in>
-              <in>linux_aarch64.S</in>
-              <in>linux_aarch64.ad</in>
-              <in>orderAccess_linux_aarch64.inline.hpp</in>
-              <in>os_linux_aarch64.cpp</in>
-              <in>os_linux_aarch64.hpp</in>
-              <in>os_linux_aarch64.inline.hpp</in>
-              <in>prefetch_linux_aarch64.inline.hpp</in>
-              <in>threadLS_linux_aarch64.s</in>
-              <in>thread_linux_aarch64.cpp</in>
-              <in>thread_linux_aarch64.hpp</in>
-              <in>vmStructs_linux_aarch64.hpp</in>
-              <in>vm_version_linux_aarch64.cpp</in>
-            </df>
-            <df name="linux_arm">
-              <in>atomic_linux_arm.hpp</in>
-              <in>bytes_linux_arm.inline.hpp</in>
-              <in>copy_linux_arm.inline.hpp</in>
-              <in>globals_linux_arm.hpp</in>
-              <in>linux_arm_32.s</in>
-              <in>linux_arm_64.s</in>
-              <in>macroAssembler_linux_arm_32.cpp</in>
-              <in>orderAccess_linux_arm.inline.hpp</in>
-              <in>os_linux_arm.cpp</in>
-              <in>os_linux_arm.hpp</in>
-              <in>prefetch_linux_arm.inline.hpp</in>
-              <in>thread_linux_arm.cpp</in>
-              <in>thread_linux_arm.hpp</in>
-              <in>vmStructs_linux_arm.hpp</in>
-              <in>vm_version_linux_arm_32.cpp</in>
-            </df>
-            <df name="linux_ppc">
-              <in>atomic_linux_ppc.hpp</in>
-              <in>bytes_linux_ppc.inline.hpp</in>
-              <in>globals_linux_ppc.hpp</in>
-              <in>orderAccess_linux_ppc.inline.hpp</in>
-              <in>os_linux_ppc.cpp</in>
-              <in>os_linux_ppc.hpp</in>
-              <in>prefetch_linux_ppc.inline.hpp</in>
-              <in>thread_linux_ppc.cpp</in>
-              <in>thread_linux_ppc.hpp</in>
-              <in>vmStructs_linux_ppc.hpp</in>
-            </df>
-            <df name="linux_s390">
-              <in>atomic_linux_s390.hpp</in>
-              <in>bytes_linux_s390.inline.hpp</in>
-              <in>globals_linux_s390.hpp</in>
-              <in>orderAccess_linux_s390.inline.hpp</in>
-              <in>os_linux_s390.cpp</in>
-              <in>os_linux_s390.hpp</in>
-              <in>prefetch_linux_s390.inline.hpp</in>
-              <in>thread_linux_s390.cpp</in>
-              <in>thread_linux_s390.hpp</in>
-              <in>vmStructs_linux_s390.hpp</in>
-            </df>
-            <df name="linux_sparc">
-              <in>atomic_linux_sparc.hpp</in>
-              <in>globals_linux_sparc.hpp</in>
-              <in>linux_sparc.ad</in>
-              <in>linux_sparc.s</in>
-              <in>orderAccess_linux_sparc.inline.hpp</in>
-              <in>os_linux_sparc.cpp</in>
-              <in>os_linux_sparc.hpp</in>
-              <in>prefetch_linux_sparc.inline.hpp</in>
-              <in>thread_linux_sparc.cpp</in>
-              <in>thread_linux_sparc.hpp</in>
-              <in>vmStructs_linux_sparc.hpp</in>
-              <in>vm_version_linux_sparc.cpp</in>
-            </df>
             <df name="linux_x86">
+              <df name="gc">
+                <df name="z">
+                  <in>zArguments_linux_x86.cpp</in>
+                  <in>zBackingFile_linux_x86.cpp</in>
+                  <in>zBackingPath_linux_x86.cpp</in>
+                  <in>zGlobals_linux_x86.cpp</in>
+                  <in>zLargePages_linux_x86.cpp</in>
+                  <in>zNUMA_linux_x86.cpp</in>
+                  <in>zPhysicalMemoryBacking_linux_x86.cpp</in>
+                  <in>zVirtualMemory_linux_x86.cpp</in>
+                </df>
+              </df>
               <in>assembler_linux_x86.cpp</in>
-              <in>atomic_linux_x86.hpp</in>
-              <in>bytes_linux_x86.inline.hpp</in>
-              <in>copy_linux_x86.inline.hpp</in>
-              <in>globals_linux_x86.hpp</in>
-              <in>linux_x86_32.s</in>
-              <in>linux_x86_64.s</in>
-              <in>orderAccess_linux_x86.inline.hpp</in>
               <in>os_linux_x86.cpp</in>
-              <in>os_linux_x86.hpp</in>
-              <in>os_linux_x86.inline.hpp</in>
-              <in>prefetch_linux_x86.inline.hpp</in>
               <in>thread_linux_x86.cpp</in>
-              <in>thread_linux_x86.hpp</in>
-              <in>vmStructs_linux_x86.hpp</in>
               <in>vm_version_linux_x86.cpp</in>
             </df>
-            <df name="linux_zero">
-              <in>assembler_linux_zero.cpp</in>
-              <in>atomic_linux_zero.hpp</in>
-              <in>bytes_linux_zero.inline.hpp</in>
-              <in>globals_linux_zero.hpp</in>
-              <in>orderAccess_linux_zero.inline.hpp</in>
-              <in>os_linux_zero.cpp</in>
-              <in>os_linux_zero.hpp</in>
-              <in>prefetch_linux_zero.inline.hpp</in>
-              <in>thread_linux_zero.cpp</in>
-              <in>thread_linux_zero.hpp</in>
-              <in>vmStructs_linux_zero.hpp</in>
-              <in>vm_version_linux_zero.cpp</in>
-            </df>
-            <df name="solaris_sparc">
-              <in>atomic_solaris_sparc.hpp</in>
-              <in>count_trailing_zeros_solaris_sparc.hpp</in>
-              <in>globals_solaris_sparc.hpp</in>
-              <in>orderAccess_solaris_sparc.inline.hpp</in>
-              <in>os_solaris_sparc.cpp</in>
-              <in>os_solaris_sparc.hpp</in>
-              <in>prefetch_solaris_sparc.inline.hpp</in>
-              <in>solaris_sparc.il</in>
-              <in>solaris_sparc.s</in>
-              <in>thread_solaris_sparc.cpp</in>
-              <in>thread_solaris_sparc.hpp</in>
-              <in>vmStructs_solaris_sparc.hpp</in>
-              <in>vm_version_solaris_sparc.cpp</in>
-            </df>
-            <df name="solaris_x86">
-              <in>assembler_solaris_x86.cpp</in>
-              <in>atomic_solaris_x86.hpp</in>
-              <in>bytes_solaris_x86.inline.hpp</in>
-              <in>copy_solaris_x86.inline.hpp</in>
-              <in>count_trailing_zeros_solaris_x86.hpp</in>
-              <in>globals_solaris_x86.hpp</in>
-              <in>orderAccess_solaris_x86.inline.hpp</in>
-              <in>os_solaris_x86.cpp</in>
-              <in>os_solaris_x86.hpp</in>
-              <in>os_solaris_x86.inline.hpp</in>
-              <in>prefetch_solaris_x86.inline.hpp</in>
-              <in>solaris_x86_64.il</in>
-              <in>solaris_x86_64.s</in>
-              <in>thread_solaris_x86.cpp</in>
-              <in>thread_solaris_x86.hpp</in>
-              <in>vmStructs_solaris_x86.hpp</in>
-              <in>vm_version_solaris_x86.cpp</in>
-            </df>
-            <df name="windows_x86">
-              <in>assembler_windows_x86.cpp</in>
-              <in>atomic_windows_x86.hpp</in>
-              <in>bytes_windows_x86.inline.hpp</in>
-              <in>copy_windows_x86.inline.hpp</in>
-              <in>globals_windows_x86.hpp</in>
-              <in>orderAccess_windows_x86.inline.hpp</in>
-              <in>os_windows_x86.cpp</in>
-              <in>os_windows_x86.hpp</in>
-              <in>os_windows_x86.inline.hpp</in>
-              <in>prefetch_windows_x86.inline.hpp</in>
-              <in>thread_windows_x86.cpp</in>
-              <in>thread_windows_x86.hpp</in>
-              <in>unwind_windows_x86.hpp</in>
-              <in>vmStructs_windows_x86.hpp</in>
-              <in>vm_version_windows_x86.cpp</in>
-            </df>
           </df>
           <df name="share">
             <df name="adlc">
-              <df name="Test">
-                <in>i486.ad</in>
-              </df>
-              <in>adlc.hpp</in>
               <in>adlparse.cpp</in>
-              <in>adlparse.hpp</in>
               <in>archDesc.cpp</in>
-              <in>archDesc.hpp</in>
               <in>arena.cpp</in>
-              <in>arena.hpp</in>
               <in>dfa.cpp</in>
               <in>dict2.cpp</in>
-              <in>dict2.hpp</in>
               <in>filebuff.cpp</in>
-              <in>filebuff.hpp</in>
               <in>forms.cpp</in>
-              <in>forms.hpp</in>
               <in>formsopt.cpp</in>
-              <in>formsopt.hpp</in>
               <in>formssel.cpp</in>
-              <in>formssel.hpp</in>
               <in>main.cpp</in>
               <in>output_c.cpp</in>
               <in>output_h.cpp</in>
             </df>
             <df name="aot">
               <in>aotCodeHeap.cpp</in>
-              <in>aotCodeHeap.hpp</in>
               <in>aotCompiledMethod.cpp</in>
-              <in>aotCompiledMethod.hpp</in>
               <in>aotLoader.cpp</in>
-              <in>aotLoader.hpp</in>
-              <in>aotLoader.inline.hpp</in>
               <in>compiledIC_aot.cpp</in>
-              <in>compiledIC_aot.hpp</in>
             </df>
             <df name="asm">
               <in>assembler.cpp</in>
-              <in>assembler.hpp</in>
-              <in>assembler.inline.hpp</in>
               <in>codeBuffer.cpp</in>
-              <in>codeBuffer.hpp</in>
-              <in>macroAssembler.hpp</in>
-              <in>macroAssembler.inline.hpp</in>
               <in>register.cpp</in>
-              <in>register.hpp</in>
             </df>
             <df name="c1">
               <in>c1_CFGPrinter.cpp</in>
-              <in>c1_CFGPrinter.hpp</in>
               <in>c1_Canonicalizer.cpp</in>
-              <in>c1_Canonicalizer.hpp</in>
-              <in>c1_CodeStubs.hpp</in>
               <in>c1_Compilation.cpp</in>
-              <in>c1_Compilation.hpp</in>
               <in>c1_Compiler.cpp</in>
-              <in>c1_Compiler.hpp</in>
               <in>c1_Defs.cpp</in>
-              <in>c1_Defs.hpp</in>
-              <in>c1_FpuStackSim.hpp</in>
               <in>c1_FrameMap.cpp</in>
-              <in>c1_FrameMap.hpp</in>
               <in>c1_GraphBuilder.cpp</in>
-              <in>c1_GraphBuilder.hpp</in>
               <in>c1_IR.cpp</in>
-              <in>c1_IR.hpp</in>
               <in>c1_Instruction.cpp</in>
-              <in>c1_Instruction.hpp</in>
               <in>c1_InstructionPrinter.cpp</in>
-              <in>c1_InstructionPrinter.hpp</in>
               <in>c1_LIR.cpp</in>
-              <in>c1_LIR.hpp</in>
               <in>c1_LIRAssembler.cpp</in>
-              <in>c1_LIRAssembler.hpp</in>
               <in>c1_LIRGenerator.cpp</in>
-              <in>c1_LIRGenerator.hpp</in>
               <in>c1_LinearScan.cpp</in>
-              <in>c1_LinearScan.hpp</in>
-              <in>c1_MacroAssembler.hpp</in>
               <in>c1_Optimizer.cpp</in>
-              <in>c1_Optimizer.hpp</in>
               <in>c1_RangeCheckElimination.cpp</in>
-              <in>c1_RangeCheckElimination.hpp</in>
               <in>c1_Runtime1.cpp</in>
-              <in>c1_Runtime1.hpp</in>
               <in>c1_ValueMap.cpp</in>
-              <in>c1_ValueMap.hpp</in>
               <in>c1_ValueSet.cpp</in>
-              <in>c1_ValueSet.hpp</in>
-              <in>c1_ValueSet.inline.hpp</in>
               <in>c1_ValueStack.cpp</in>
-              <in>c1_ValueStack.hpp</in>
               <in>c1_ValueType.cpp</in>
-              <in>c1_ValueType.hpp</in>
               <in>c1_globals.cpp</in>
-              <in>c1_globals.hpp</in>
             </df>
             <df name="ci">
               <in>bcEscapeAnalyzer.cpp</in>
-              <in>bcEscapeAnalyzer.hpp</in>
               <in>ciArray.cpp</in>
-              <in>ciArray.hpp</in>
               <in>ciArrayKlass.cpp</in>
-              <in>ciArrayKlass.hpp</in>
               <in>ciBaseObject.cpp</in>
-              <in>ciBaseObject.hpp</in>
-              <in>ciCallProfile.hpp</in>
               <in>ciCallSite.cpp</in>
-              <in>ciCallSite.hpp</in>
-              <in>ciClassList.hpp</in>
               <in>ciConstant.cpp</in>
-              <in>ciConstant.hpp</in>
               <in>ciConstantPoolCache.cpp</in>
-              <in>ciConstantPoolCache.hpp</in>
               <in>ciEnv.cpp</in>
-              <in>ciEnv.hpp</in>
               <in>ciExceptionHandler.cpp</in>
-              <in>ciExceptionHandler.hpp</in>
               <in>ciField.cpp</in>
-              <in>ciField.hpp</in>
               <in>ciFlags.cpp</in>
-              <in>ciFlags.hpp</in>
               <in>ciInstance.cpp</in>
-              <in>ciInstance.hpp</in>
               <in>ciInstanceKlass.cpp</in>
-              <in>ciInstanceKlass.hpp</in>
               <in>ciKlass.cpp</in>
-              <in>ciKlass.hpp</in>
               <in>ciMemberName.cpp</in>
-              <in>ciMemberName.hpp</in>
               <in>ciMetadata.cpp</in>
-              <in>ciMetadata.hpp</in>
               <in>ciMethod.cpp</in>
-              <in>ciMethod.hpp</in>
               <in>ciMethodBlocks.cpp</in>
-              <in>ciMethodBlocks.hpp</in>
               <in>ciMethodData.cpp</in>
-              <in>ciMethodData.hpp</in>
               <in>ciMethodHandle.cpp</in>
-              <in>ciMethodHandle.hpp</in>
-              <in>ciMethodType.hpp</in>
+              <in>ciMethodType.cpp</in>
               <in>ciNullObject.cpp</in>
-              <in>ciNullObject.hpp</in>
               <in>ciObjArray.cpp</in>
-              <in>ciObjArray.hpp</in>
               <in>ciObjArrayKlass.cpp</in>
-              <in>ciObjArrayKlass.hpp</in>
               <in>ciObject.cpp</in>
-              <in>ciObject.hpp</in>
               <in>ciObjectFactory.cpp</in>
-              <in>ciObjectFactory.hpp</in>
               <in>ciReplay.cpp</in>
-              <in>ciReplay.hpp</in>
               <in>ciSignature.cpp</in>
-              <in>ciSignature.hpp</in>
               <in>ciStreams.cpp</in>
-              <in>ciStreams.hpp</in>
               <in>ciSymbol.cpp</in>
-              <in>ciSymbol.hpp</in>
               <in>ciType.cpp</in>
-              <in>ciType.hpp</in>
               <in>ciTypeArray.cpp</in>
-              <in>ciTypeArray.hpp</in>
               <in>ciTypeArrayKlass.cpp</in>
-              <in>ciTypeArrayKlass.hpp</in>
               <in>ciTypeFlow.cpp</in>
-              <in>ciTypeFlow.hpp</in>
               <in>ciUtilities.cpp</in>
-              <in>ciUtilities.hpp</in>
-              <in>compilerInterface.hpp</in>
             </df>
             <df name="classfile">
               <in>altHashing.cpp</in>
-              <in>altHashing.hpp</in>
               <in>bytecodeAssembler.cpp</in>
-              <in>bytecodeAssembler.hpp</in>
               <in>classFileError.cpp</in>
               <in>classFileParser.cpp</in>
-              <in>classFileParser.hpp</in>
               <in>classFileStream.cpp</in>
-              <in>classFileStream.hpp</in>
               <in>classListParser.cpp</in>
-              <in>classListParser.hpp</in>
               <in>classLoader.cpp</in>
-              <in>classLoader.hpp</in>
               <in>classLoaderData.cpp</in>
-              <in>classLoaderData.hpp</in>
-              <in>classLoaderData.inline.hpp</in>
+              <in>classLoaderDataGraph.cpp</in>
               <in>classLoaderExt.cpp</in>
-              <in>classLoaderExt.hpp</in>
+              <in>classLoaderHierarchyDCmd.cpp</in>
               <in>classLoaderStats.cpp</in>
-              <in>classLoaderStats.hpp</in>
               <in>compactHashtable.cpp</in>
-              <in>compactHashtable.hpp</in>
-              <in>compactHashtable.inline.hpp</in>
               <in>defaultMethods.cpp</in>
-              <in>defaultMethods.hpp</in>
               <in>dictionary.cpp</in>
-              <in>dictionary.hpp</in>
               <in>javaAssertions.cpp</in>
-              <in>javaAssertions.hpp</in>
               <in>javaClasses.cpp</in>
-              <in>javaClasses.hpp</in>
-              <in>javaClasses.inline.hpp</in>
-              <in>jimage.hpp</in>
               <in>klassFactory.cpp</in>
-              <in>klassFactory.hpp</in>
               <in>loaderConstraints.cpp</in>
-              <in>loaderConstraints.hpp</in>
               <in>metadataOnStackMark.cpp</in>
-              <in>metadataOnStackMark.hpp</in>
               <in>moduleEntry.cpp</in>
-              <in>moduleEntry.hpp</in>
               <in>modules.cpp</in>
-              <in>modules.hpp</in>
               <in>packageEntry.cpp</in>
-              <in>packageEntry.hpp</in>
               <in>placeholders.cpp</in>
-              <in>placeholders.hpp</in>
               <in>protectionDomainCache.cpp</in>
-              <in>protectionDomainCache.hpp</in>
               <in>resolutionErrors.cpp</in>
-              <in>resolutionErrors.hpp</in>
-              <in>sharedClassUtil.hpp</in>
               <in>sharedPathsMiscInfo.cpp</in>
-              <in>sharedPathsMiscInfo.hpp</in>
               <in>stackMapFrame.cpp</in>
-              <in>stackMapFrame.hpp</in>
               <in>stackMapTable.cpp</in>
-              <in>stackMapTable.hpp</in>
-              <in>stackMapTableFormat.hpp</in>
               <in>stringTable.cpp</in>
-              <in>stringTable.hpp</in>
               <in>symbolTable.cpp</in>
-              <in>symbolTable.hpp</in>
               <in>systemDictionary.cpp</in>
-              <in>systemDictionary.hpp</in>
-              <in>systemDictionaryShared.hpp</in>
-              <in>systemDictionary_ext.hpp</in>
+              <in>systemDictionaryShared.cpp</in>
               <in>verificationType.cpp</in>
-              <in>verificationType.hpp</in>
               <in>verifier.cpp</in>
-              <in>verifier.hpp</in>
               <in>vmSymbols.cpp</in>
-              <in>vmSymbols.hpp</in>
-              <in>vmSymbols_ext.hpp</in>
             </df>
             <df name="code">
+              <in>codeBehaviours.cpp</in>
               <in>codeBlob.cpp</in>
-              <in>codeBlob.hpp</in>
               <in>codeCache.cpp</in>
-              <in>codeCache.hpp</in>
+              <in>codeHeapState.cpp</in>
               <in>compiledIC.cpp</in>
-              <in>compiledIC.hpp</in>
               <in>compiledMethod.cpp</in>
-              <in>compiledMethod.hpp</in>
-              <in>compiledMethod.inline.hpp</in>
               <in>compressedStream.cpp</in>
-              <in>compressedStream.hpp</in>
               <in>debugInfo.cpp</in>
-              <in>debugInfo.hpp</in>
               <in>debugInfoRec.cpp</in>
-              <in>debugInfoRec.hpp</in>
               <in>dependencies.cpp</in>
-              <in>dependencies.hpp</in>
               <in>dependencyContext.cpp</in>
-              <in>dependencyContext.hpp</in>
               <in>exceptionHandlerTable.cpp</in>
-              <in>exceptionHandlerTable.hpp</in>
               <in>icBuffer.cpp</in>
-              <in>icBuffer.hpp</in>
-              <in>jvmticmlr.h</in>
               <in>location.cpp</in>
-              <in>location.hpp</in>
-              <in>nativeInst.hpp</in>
               <in>nmethod.cpp</in>
-              <in>nmethod.hpp</in>
               <in>oopRecorder.cpp</in>
-              <in>oopRecorder.hpp</in>
               <in>pcDesc.cpp</in>
-              <in>pcDesc.hpp</in>
               <in>relocInfo.cpp</in>
-              <in>relocInfo.hpp</in>
               <in>relocInfo_ext.cpp</in>
-              <in>relocInfo_ext.hpp</in>
               <in>scopeDesc.cpp</in>
-              <in>scopeDesc.hpp</in>
               <in>stubs.cpp</in>
-              <in>stubs.hpp</in>
               <in>vmreg.cpp</in>
-              <in>vmreg.hpp</in>
-              <in>vmreg.inline.hpp</in>
               <in>vtableStubs.cpp</in>
-              <in>vtableStubs.hpp</in>
             </df>
             <df name="compiler">
               <in>abstractCompiler.cpp</in>
-              <in>abstractCompiler.hpp</in>
               <in>compileBroker.cpp</in>
-              <in>compileBroker.hpp</in>
               <in>compileLog.cpp</in>
-              <in>compileLog.hpp</in>
               <in>compileTask.cpp</in>
-              <in>compileTask.hpp</in>
               <in>compilerDefinitions.cpp</in>
-              <in>compilerDefinitions.hpp</in>
               <in>compilerDirectives.cpp</in>
-              <in>compilerDirectives.hpp</in>
               <in>compilerOracle.cpp</in>
-              <in>compilerOracle.hpp</in>
               <in>directivesParser.cpp</in>
-              <in>directivesParser.hpp</in>
               <in>disassembler.cpp</in>
-              <in>disassembler.hpp</in>
               <in>methodLiveness.cpp</in>
-              <in>methodLiveness.hpp</in>
               <in>methodMatcher.cpp</in>
-              <in>methodMatcher.hpp</in>
               <in>oopMap.cpp</in>
-              <in>oopMap.hpp</in>
             </df>
             <df name="gc">
               <df name="cms">
                 <in>adaptiveFreeList.cpp</in>
-                <in>adaptiveFreeList.hpp</in>
                 <in>allocationStats.cpp</in>
-                <in>allocationStats.hpp</in>
+                <in>cmsArguments.cpp</in>
+                <in>cmsCardTable.cpp</in>
                 <in>cmsCollectorPolicy.cpp</in>
-                <in>cmsCollectorPolicy.hpp</in>
+                <in>cmsGCStats.cpp</in>
+                <in>cmsHeap.cpp</in>
                 <in>cmsLockVerifier.cpp</in>
-                <in>cmsLockVerifier.hpp</in>
-                <in>cmsOopClosures.cpp</in>
-                <in>cmsOopClosures.hpp</in>
-                <in>cmsOopClosures.inline.hpp</in>
+                <in>cmsVMOperations.cpp</in>
                 <in>compactibleFreeListSpace.cpp</in>
-                <in>compactibleFreeListSpace.hpp</in>
                 <in>concurrentMarkSweepGeneration.cpp</in>
-                <in>concurrentMarkSweepGeneration.hpp</in>
-                <in>concurrentMarkSweepGeneration.inline.hpp</in>
                 <in>concurrentMarkSweepThread.cpp</in>
-                <in>concurrentMarkSweepThread.hpp</in>
                 <in>freeChunk.cpp</in>
-                <in>freeChunk.hpp</in>
                 <in>gSpaceCounters.cpp</in>
-                <in>gSpaceCounters.hpp</in>
-                <in>parCardTableModRefBS.cpp</in>
+                <in>jvmFlagConstraintsCMS.cpp</in>
                 <in>parNewGeneration.cpp</in>
-                <in>parNewGeneration.hpp</in>
-                <in>parNewGeneration.inline.hpp</in>
-                <in>parOopClosures.cpp</in>
-                <in>parOopClosures.hpp</in>
-                <in>parOopClosures.inline.hpp</in>
                 <in>promotionInfo.cpp</in>
-                <in>promotionInfo.hpp</in>
-                <in>vmCMSOperations.cpp</in>
-                <in>vmCMSOperations.hpp</in>
-                <in>vmStructs_cms.hpp</in>
-                <in>vmStructs_parNew.hpp</in>
                 <in>yieldingWorkgroup.cpp</in>
-                <in>yieldingWorkgroup.hpp</in>
+              </df>
+              <df name="epsilon">
+                <in>epsilonArguments.cpp</in>
+                <in>epsilonBarrierSet.cpp</in>
+                <in>epsilonHeap.cpp</in>
+                <in>epsilonMemoryPool.cpp</in>
+                <in>epsilonMonitoringSupport.cpp</in>
               </df>
               <df name="g1">
-                <in>bufferingOopClosure.hpp</in>
+                <df name="c1">
+                  <in>g1BarrierSetC1.cpp</in>
+                </df>
+                <df name="c2">
+                  <in>g1BarrierSetC2.cpp</in>
+                </df>
                 <in>collectionSetChooser.cpp</in>
-                <in>collectionSetChooser.hpp</in>
-                <in>concurrentG1Refine.cpp</in>
-                <in>concurrentG1Refine.hpp</in>
-                <in>concurrentG1RefineThread.cpp</in>
-                <in>concurrentG1RefineThread.hpp</in>
-                <in>concurrentMarkThread.cpp</in>
-                <in>concurrentMarkThread.hpp</in>
-                <in>concurrentMarkThread.inline.hpp</in>
                 <in>dirtyCardQueue.cpp</in>
-                <in>dirtyCardQueue.hpp</in>
-                <in>evacuationInfo.hpp</in>
                 <in>g1AllocRegion.cpp</in>
-                <in>g1AllocRegion.hpp</in>
-                <in>g1AllocRegion.inline.hpp</in>
-                <in>g1AllocationContext.hpp</in>
                 <in>g1Allocator.cpp</in>
-                <in>g1Allocator.hpp</in>
-                <in>g1Allocator.inline.hpp</in>
-                <in>g1Allocator_ext.cpp</in>
                 <in>g1Analytics.cpp</in>
-                <in>g1Analytics.hpp</in>
+                <in>g1Arguments.cpp</in>
+                <in>g1BarrierSet.cpp</in>
+                <in>g1BarrierSetRuntime.cpp</in>
                 <in>g1BiasedArray.cpp</in>
-                <in>g1BiasedArray.hpp</in>
                 <in>g1BlockOffsetTable.cpp</in>
-                <in>g1BlockOffsetTable.hpp</in>
-                <in>g1BlockOffsetTable.inline.hpp</in>
                 <in>g1CardCounts.cpp</in>
-                <in>g1CardCounts.hpp</in>
-                <in>g1CardLiveData.cpp</in>
-                <in>g1CardLiveData.hpp</in>
-                <in>g1CardLiveData.inline.hpp</in>
+                <in>g1CardTable.cpp</in>
                 <in>g1CodeBlobClosure.cpp</in>
-                <in>g1CodeBlobClosure.hpp</in>
                 <in>g1CodeCacheRemSet.cpp</in>
-                <in>g1CodeCacheRemSet.hpp</in>
-                <in>g1CodeRootSetTable.hpp</in>
                 <in>g1CollectedHeap.cpp</in>
-                <in>g1CollectedHeap.hpp</in>
-                <in>g1CollectedHeap.inline.hpp</in>
-                <in>g1CollectedHeap_ext.cpp</in>
                 <in>g1CollectionSet.cpp</in>
-                <in>g1CollectionSet.hpp</in>
                 <in>g1CollectorPolicy.cpp</in>
-                <in>g1CollectorPolicy.hpp</in>
-                <in>g1CollectorState.hpp</in>
                 <in>g1ConcurrentMark.cpp</in>
-                <in>g1ConcurrentMark.hpp</in>
-                <in>g1ConcurrentMark.inline.hpp</in>
                 <in>g1ConcurrentMarkBitMap.cpp</in>
-                <in>g1ConcurrentMarkBitMap.hpp</in>
-                <in>g1ConcurrentMarkBitMap.inline.hpp</in>
                 <in>g1ConcurrentMarkObjArrayProcessor.cpp</in>
-                <in>g1ConcurrentMarkObjArrayProcessor.hpp</in>
-                <in>g1ConcurrentMarkObjArrayProcessor.inline.hpp</in>
-                <in>g1DefaultPolicy.cpp</in>
-                <in>g1DefaultPolicy.hpp</in>
-                <in>g1EdenRegions.hpp</in>
+                <in>g1ConcurrentMarkThread.cpp</in>
+                <in>g1ConcurrentRefine.cpp</in>
+                <in>g1ConcurrentRefineThread.cpp</in>
                 <in>g1EvacFailure.cpp</in>
-                <in>g1EvacFailure.hpp</in>
                 <in>g1EvacStats.cpp</in>
-                <in>g1EvacStats.hpp</in>
-                <in>g1EvacStats.inline.hpp</in>
                 <in>g1FromCardCache.cpp</in>
-                <in>g1FromCardCache.hpp</in>
+                <in>g1FullCollector.cpp</in>
+                <in>g1FullGCAdjustTask.cpp</in>
+                <in>g1FullGCCompactTask.cpp</in>
+                <in>g1FullGCCompactionPoint.cpp</in>
+                <in>g1FullGCMarkTask.cpp</in>
+                <in>g1FullGCMarker.cpp</in>
+                <in>g1FullGCOopClosures.cpp</in>
+                <in>g1FullGCPrepareTask.cpp</in>
+                <in>g1FullGCReferenceProcessorExecutor.cpp</in>
                 <in>g1FullGCScope.cpp</in>
-                <in>g1FullGCScope.hpp</in>
+                <in>g1FullGCTask.cpp</in>
                 <in>g1GCPhaseTimes.cpp</in>
-                <in>g1GCPhaseTimes.hpp</in>
-                <in>g1HRPrinter.hpp</in>
-                <in>g1HeapRegionTraceType.hpp</in>
+                <in>g1HeapRegionEventSender.cpp</in>
                 <in>g1HeapSizingPolicy.cpp</in>
-                <in>g1HeapSizingPolicy.hpp</in>
                 <in>g1HeapSizingPolicy_ext.cpp</in>
                 <in>g1HeapTransition.cpp</in>
-                <in>g1HeapTransition.hpp</in>
                 <in>g1HeapVerifier.cpp</in>
-                <in>g1HeapVerifier.hpp</in>
                 <in>g1HotCardCache.cpp</in>
-                <in>g1HotCardCache.hpp</in>
                 <in>g1IHOPControl.cpp</in>
-                <in>g1IHOPControl.hpp</in>
-                <in>g1InCSetState.hpp</in>
-                <in>g1InitialMarkToMixedTimeTracker.hpp</in>
                 <in>g1MMUTracker.cpp</in>
-                <in>g1MMUTracker.hpp</in>
-                <in>g1MarkSweep.cpp</in>
-                <in>g1MarkSweep.hpp</in>
-                <in>g1MarkSweep_ext.cpp</in>
+                <in>g1MemoryPool.cpp</in>
                 <in>g1MonitoringSupport.cpp</in>
-                <in>g1MonitoringSupport.hpp</in>
                 <in>g1OopClosures.cpp</in>
-                <in>g1OopClosures.hpp</in>
-                <in>g1OopClosures.inline.hpp</in>
+                <in>g1OopStarChunkedList.cpp</in>
                 <in>g1PageBasedVirtualSpace.cpp</in>
-                <in>g1PageBasedVirtualSpace.hpp</in>
                 <in>g1ParScanThreadState.cpp</in>
-                <in>g1ParScanThreadState.hpp</in>
-                <in>g1ParScanThreadState.inline.hpp</in>
-                <in>g1ParScanThreadState_ext.cpp</in>
-                <in>g1Policy.hpp</in>
-                <in>g1Predictions.hpp</in>
+                <in>g1Policy.cpp</in>
+                <in>g1RegionMarkStatsCache.cpp</in>
                 <in>g1RegionToSpaceMapper.cpp</in>
-                <in>g1RegionToSpaceMapper.hpp</in>
                 <in>g1RemSet.cpp</in>
-                <in>g1RemSet.hpp</in>
-                <in>g1RemSet.inline.hpp</in>
                 <in>g1RemSetSummary.cpp</in>
-                <in>g1RemSetSummary.hpp</in>
+                <in>g1RemSetTrackingPolicy.cpp</in>
                 <in>g1RootClosures.cpp</in>
-                <in>g1RootClosures.hpp</in>
-                <in>g1RootClosures_ext.cpp</in>
                 <in>g1RootProcessor.cpp</in>
-                <in>g1RootProcessor.hpp</in>
-                <in>g1SATBCardTableModRefBS.cpp</in>
-                <in>g1SATBCardTableModRefBS.hpp</in>
-                <in>g1SATBCardTableModRefBS.inline.hpp</in>
-                <in>g1SerialFullCollector.cpp</in>
-                <in>g1SerialFullCollector.hpp</in>
-                <in>g1SharedClosures.hpp</in>
+                <in>g1SATBMarkQueueSet.cpp</in>
                 <in>g1StringDedup.cpp</in>
-                <in>g1StringDedup.hpp</in>
                 <in>g1StringDedupQueue.cpp</in>
-                <in>g1StringDedupQueue.hpp</in>
                 <in>g1StringDedupStat.cpp</in>
-                <in>g1StringDedupStat.hpp</in>
-                <in>g1StringDedupTable.cpp</in>
-                <in>g1StringDedupTable.hpp</in>
-                <in>g1StringDedupThread.cpp</in>
-                <in>g1StringDedupThread.hpp</in>
                 <in>g1SurvivorRegions.cpp</in>
-                <in>g1SurvivorRegions.hpp</in>
-                <in>g1YCTypes.hpp</in>
+                <in>g1VMOperations.cpp</in>
                 <in>g1YoungGenSizer.cpp</in>
-                <in>g1YoungGenSizer.hpp</in>
                 <in>g1YoungRemSetSamplingThread.cpp</in>
-                <in>g1YoungRemSetSamplingThread.hpp</in>
-                <in>g1_globals.cpp</in>
-                <in>g1_globals.hpp</in>
-                <in>g1_specialized_oop_closures.hpp</in>
-                <in>hSpaceCounters.cpp</in>
-                <in>hSpaceCounters.hpp</in>
                 <in>heapRegion.cpp</in>
-                <in>heapRegion.hpp</in>
-                <in>heapRegion.inline.hpp</in>
-                <in>heapRegionBounds.hpp</in>
-                <in>heapRegionBounds.inline.hpp</in>
                 <in>heapRegionManager.cpp</in>
-                <in>heapRegionManager.hpp</in>
-                <in>heapRegionManager.inline.hpp</in>
                 <in>heapRegionRemSet.cpp</in>
-                <in>heapRegionRemSet.hpp</in>
                 <in>heapRegionSet.cpp</in>
-                <in>heapRegionSet.hpp</in>
-                <in>heapRegionSet.inline.hpp</in>
                 <in>heapRegionTracer.cpp</in>
-                <in>heapRegionTracer.hpp</in>
                 <in>heapRegionType.cpp</in>
-                <in>heapRegionType.hpp</in>
-                <in>ptrQueue.cpp</in>
-                <in>ptrQueue.hpp</in>
-                <in>satbMarkQueue.cpp</in>
-                <in>satbMarkQueue.hpp</in>
+                <in>jvmFlagConstraintsG1.cpp</in>
                 <in>sparsePRT.cpp</in>
-                <in>sparsePRT.hpp</in>
                 <in>survRateGroup.cpp</in>
-                <in>survRateGroup.hpp</in>
-                <in>suspendibleThreadSet.cpp</in>
-                <in>suspendibleThreadSet.hpp</in>
-                <in>vmStructs_g1.hpp</in>
-                <in>vm_operations_g1.cpp</in>
-                <in>vm_operations_g1.hpp</in>
               </df>
               <df name="parallel">
                 <in>adjoiningGenerations.cpp</in>
-                <in>adjoiningGenerations.hpp</in>
                 <in>adjoiningVirtualSpaces.cpp</in>
-                <in>adjoiningVirtualSpaces.hpp</in>
                 <in>asPSOldGen.cpp</in>
-                <in>asPSOldGen.hpp</in>
                 <in>asPSYoungGen.cpp</in>
-                <in>asPSYoungGen.hpp</in>
-                <in>cardTableExtension.cpp</in>
-                <in>cardTableExtension.hpp</in>
                 <in>gcAdaptivePolicyCounters.cpp</in>
-                <in>gcAdaptivePolicyCounters.hpp</in>
                 <in>gcTaskManager.cpp</in>
-                <in>gcTaskManager.hpp</in>
                 <in>gcTaskThread.cpp</in>
-                <in>gcTaskThread.hpp</in>
                 <in>generationSizer.cpp</in>
-                <in>generationSizer.hpp</in>
                 <in>immutableSpace.cpp</in>
-                <in>immutableSpace.hpp</in>
+                <in>jvmFlagConstraintsParallel.cpp</in>
                 <in>mutableNUMASpace.cpp</in>
-                <in>mutableNUMASpace.hpp</in>
                 <in>mutableSpace.cpp</in>
-                <in>mutableSpace.hpp</in>
                 <in>objectStartArray.cpp</in>
-                <in>objectStartArray.hpp</in>
-                <in>objectStartArray.inline.hpp</in>
                 <in>parMarkBitMap.cpp</in>
-                <in>parMarkBitMap.hpp</in>
-                <in>parMarkBitMap.inline.hpp</in>
+                <in>parallelArguments.cpp</in>
                 <in>parallelScavengeHeap.cpp</in>
-                <in>parallelScavengeHeap.hpp</in>
-                <in>parallelScavengeHeap.inline.hpp</in>
                 <in>pcTasks.cpp</in>
-                <in>pcTasks.hpp</in>
                 <in>psAdaptiveSizePolicy.cpp</in>
-                <in>psAdaptiveSizePolicy.hpp</in>
+                <in>psCardTable.cpp</in>
                 <in>psCompactionManager.cpp</in>
-                <in>psCompactionManager.hpp</in>
-                <in>psCompactionManager.inline.hpp</in>
                 <in>psGCAdaptivePolicyCounters.cpp</in>
-                <in>psGCAdaptivePolicyCounters.hpp</in>
                 <in>psGenerationCounters.cpp</in>
-                <in>psGenerationCounters.hpp</in>
                 <in>psMarkSweep.cpp</in>
-                <in>psMarkSweep.hpp</in>
                 <in>psMarkSweepDecorator.cpp</in>
-                <in>psMarkSweepDecorator.hpp</in>
+                <in>psMemoryPool.cpp</in>
                 <in>psOldGen.cpp</in>
-                <in>psOldGen.hpp</in>
                 <in>psParallelCompact.cpp</in>
-                <in>psParallelCompact.hpp</in>
-                <in>psParallelCompact.inline.hpp</in>
                 <in>psPromotionLAB.cpp</in>
-                <in>psPromotionLAB.hpp</in>
-                <in>psPromotionLAB.inline.hpp</in>
                 <in>psPromotionManager.cpp</in>
-                <in>psPromotionManager.hpp</in>
-                <in>psPromotionManager.inline.hpp</in>
                 <in>psScavenge.cpp</in>
-                <in>psScavenge.hpp</in>
-                <in>psScavenge.inline.hpp</in>
                 <in>psTasks.cpp</in>
-                <in>psTasks.hpp</in>
+                <in>psVMOperations.cpp</in>
                 <in>psVirtualspace.cpp</in>
-                <in>psVirtualspace.hpp</in>
                 <in>psYoungGen.cpp</in>
-                <in>psYoungGen.hpp</in>
                 <in>spaceCounters.cpp</in>
-                <in>spaceCounters.hpp</in>
-                <in>vmPSOperations.cpp</in>
-                <in>vmPSOperations.hpp</in>
-                <in>vmStructs_parallelgc.hpp</in>
               </df>
               <df name="serial">
                 <in>cSpaceCounters.cpp</in>
-                <in>cSpaceCounters.hpp</in>
                 <in>defNewGeneration.cpp</in>
-                <in>defNewGeneration.hpp</in>
-                <in>defNewGeneration.inline.hpp</in>
                 <in>genMarkSweep.cpp</in>
-                <in>genMarkSweep.hpp</in>
                 <in>markSweep.cpp</in>
-                <in>markSweep.hpp</in>
-                <in>markSweep.inline.hpp</in>
+                <in>serialArguments.cpp</in>
+                <in>serialHeap.cpp</in>
                 <in>tenuredGeneration.cpp</in>
-                <in>tenuredGeneration.hpp</in>
-                <in>tenuredGeneration.inline.hpp</in>
               </df>
               <df name="shared">
+                <df name="c1">
+                  <in>barrierSetC1.cpp</in>
+                  <in>cardTableBarrierSetC1.cpp</in>
+                  <in>modRefBarrierSetC1.cpp</in>
+                </df>
+                <df name="c2">
+                  <in>barrierSetC2.cpp</in>
+                  <in>cardTableBarrierSetC2.cpp</in>
+                  <in>modRefBarrierSetC2.cpp</in>
+                </df>
+                <df name="stringdedup">
+                  <in>stringDedup.cpp</in>
+                  <in>stringDedupQueue.cpp</in>
+                  <in>stringDedupStat.cpp</in>
+                  <in>stringDedupTable.cpp</in>
+                  <in>stringDedupThread.cpp</in>
+                </df>
+                <in>accessBarrierSupport.cpp</in>
                 <in>adaptiveSizePolicy.cpp</in>
-                <in>adaptiveSizePolicy.hpp</in>
                 <in>ageTable.cpp</in>
-                <in>ageTable.hpp</in>
-                <in>ageTable.inline.hpp</in>
                 <in>ageTableTracer.cpp</in>
-                <in>ageTableTracer.hpp</in>
                 <in>allocTracer.cpp</in>
-                <in>allocTracer.hpp</in>
                 <in>barrierSet.cpp</in>
-                <in>barrierSet.hpp</in>
-                <in>barrierSet.inline.hpp</in>
+                <in>barrierSetNMethod.cpp</in>
                 <in>blockOffsetTable.cpp</in>
-                <in>blockOffsetTable.hpp</in>
-                <in>blockOffsetTable.inline.hpp</in>
                 <in>cardGeneration.cpp</in>
-                <in>cardGeneration.hpp</in>
-                <in>cardGeneration.inline.hpp</in>
-                <in>cardTableModRefBS.cpp</in>
-                <in>cardTableModRefBS.hpp</in>
-                <in>cardTableModRefBS.inline.hpp</in>
-                <in>cardTableModRefBSForCTRS.cpp</in>
-                <in>cardTableModRefBSForCTRS.hpp</in>
+                <in>cardTable.cpp</in>
+                <in>cardTableBarrierSet.cpp</in>
                 <in>cardTableRS.cpp</in>
-                <in>cardTableRS.hpp</in>
                 <in>collectedHeap.cpp</in>
-                <in>collectedHeap.hpp</in>
-                <in>collectedHeap.inline.hpp</in>
                 <in>collectorCounters.cpp</in>
-                <in>collectorCounters.hpp</in>
                 <in>collectorPolicy.cpp</in>
-                <in>collectorPolicy.hpp</in>
                 <in>concurrentGCPhaseManager.cpp</in>
-                <in>concurrentGCPhaseManager.hpp</in>
                 <in>concurrentGCThread.cpp</in>
-                <in>concurrentGCThread.hpp</in>
-                <in>copyFailedInfo.hpp</in>
+                <in>gcArguments.cpp</in>
+                <in>gcBehaviours.cpp</in>
                 <in>gcCause.cpp</in>
-                <in>gcCause.hpp</in>
-                <in>gcHeapSummary.hpp</in>
+                <in>gcConfig.cpp</in>
+                <in>gcConfiguration.cpp</in>
                 <in>gcId.cpp</in>
-                <in>gcId.hpp</in>
                 <in>gcLocker.cpp</in>
-                <in>gcLocker.hpp</in>
-                <in>gcLocker.inline.hpp</in>
-                <in>gcName.hpp</in>
                 <in>gcPolicyCounters.cpp</in>
-                <in>gcPolicyCounters.hpp</in>
                 <in>gcStats.cpp</in>
-                <in>gcStats.hpp</in>
                 <in>gcTimer.cpp</in>
-                <in>gcTimer.hpp</in>
                 <in>gcTrace.cpp</in>
-                <in>gcTrace.hpp</in>
                 <in>gcTraceSend.cpp</in>
                 <in>gcTraceTime.cpp</in>
-                <in>gcTraceTime.hpp</in>
-                <in>gcTraceTime.inline.hpp</in>
                 <in>gcUtil.cpp</in>
-                <in>gcUtil.hpp</in>
-                <in>gcWhen.hpp</in>
+                <in>gcVMOperations.cpp</in>
                 <in>genCollectedHeap.cpp</in>
-                <in>genCollectedHeap.hpp</in>
-                <in>genOopClosures.cpp</in>
-                <in>genOopClosures.hpp</in>
-                <in>genOopClosures.inline.hpp</in>
+                <in>genMemoryPools.cpp</in>
                 <in>generation.cpp</in>
-                <in>generation.hpp</in>
                 <in>generationCounters.cpp</in>
-                <in>generationCounters.hpp</in>
                 <in>generationSpec.cpp</in>
-                <in>generationSpec.hpp</in>
-                <in>isGCActiveMark.hpp</in>
-                <in>memset_with_concurrent_readers.hpp</in>
-                <in>modRefBarrierSet.hpp</in>
+                <in>hSpaceCounters.cpp</in>
+                <in>jvmFlagConstraintsGC.cpp</in>
+                <in>markBitMap.cpp</in>
+                <in>memAllocator.cpp</in>
                 <in>objectCountEventSender.cpp</in>
-                <in>objectCountEventSender.hpp</in>
+                <in>oopStorage.cpp</in>
+                <in>owstTaskTerminator.cpp</in>
+                <in>parallelCleaning.cpp</in>
                 <in>plab.cpp</in>
-                <in>plab.hpp</in>
-                <in>plab.inline.hpp</in>
                 <in>preservedMarks.cpp</in>
-                <in>preservedMarks.hpp</in>
-                <in>preservedMarks.inline.hpp</in>
+                <in>ptrQueue.cpp</in>
                 <in>referencePolicy.cpp</in>
-                <in>referencePolicy.hpp</in>
                 <in>referenceProcessor.cpp</in>
-                <in>referenceProcessor.hpp</in>
-                <in>referenceProcessor.inline.hpp</in>
                 <in>referenceProcessorPhaseTimes.cpp</in>
-                <in>referenceProcessorPhaseTimes.hpp</in>
-                <in>referenceProcessorStats.hpp</in>
+                <in>satbMarkQueue.cpp</in>
+                <in>softRefGenPolicy.cpp</in>
+                <in>softRefPolicy.cpp</in>
                 <in>space.cpp</in>
-                <in>space.hpp</in>
-                <in>space.inline.hpp</in>
                 <in>spaceDecorator.cpp</in>
-                <in>spaceDecorator.hpp</in>
-                <in>specialized_oop_closures.hpp</in>
                 <in>strongRootsScope.cpp</in>
-                <in>strongRootsScope.hpp</in>
+                <in>suspendibleThreadSet.cpp</in>
                 <in>taskqueue.cpp</in>
-                <in>taskqueue.hpp</in>
-                <in>taskqueue.inline.hpp</in>
                 <in>threadLocalAllocBuffer.cpp</in>
-                <in>threadLocalAllocBuffer.hpp</in>
-                <in>threadLocalAllocBuffer.inline.hpp</in>
-                <in>vmGCOperations.cpp</in>
-                <in>vmGCOperations.hpp</in>
+                <in>weakProcessor.cpp</in>
+                <in>weakProcessorPhaseTimes.cpp</in>
+                <in>weakProcessorPhases.cpp</in>
                 <in>workerDataArray.cpp</in>
-                <in>workerDataArray.hpp</in>
-                <in>workerDataArray.inline.hpp</in>
-                <in>workerManager.hpp</in>
+                <in>workerPolicy.cpp</in>
                 <in>workgroup.cpp</in>
-                <in>workgroup.hpp</in>
+              </df>
+              <df name="shenandoah">
+                <df name="c1">
+                  <in>shenandoahBarrierSetC1.cpp</in>
+                </df>
+                <df name="c2">
+                  <in>shenandoahBarrierSetC2.cpp</in>
+                  <in>shenandoahSupport.cpp</in>
+                </df>
+                <df name="heuristics">
+                  <in>shenandoahAdaptiveHeuristics.cpp</in>
+                  <in>shenandoahAggressiveHeuristics.cpp</in>
+                  <in>shenandoahCompactHeuristics.cpp</in>
+                  <in>shenandoahPassiveHeuristics.cpp</in>
+                  <in>shenandoahStaticHeuristics.cpp</in>
+                  <in>shenandoahTraversalHeuristics.cpp</in>
+                </df>
+                <in>shenandoahAllocTracker.cpp</in>
+                <in>shenandoahArguments.cpp</in>
+                <in>shenandoahAsserts.cpp</in>
+                <in>shenandoahBarrierSet.cpp</in>
+                <in>shenandoahCodeRoots.cpp</in>
+                <in>shenandoahCollectionSet.cpp</in>
+                <in>shenandoahCollectorPolicy.cpp</in>
+                <in>shenandoahConcurrentMark.cpp</in>
+                <in>shenandoahControlThread.cpp</in>
+                <in>shenandoahEvacOOMHandler.cpp</in>
+                <in>shenandoahFreeSet.cpp</in>
+                <in>shenandoahHeap.cpp</in>
+                <in>shenandoahHeapRegion.cpp</in>
+                <in>shenandoahHeapRegionCounters.cpp</in>
+                <in>shenandoahHeapRegionSet.cpp</in>
+                <in>shenandoahHeuristics.cpp</in>
+                <in>shenandoahMarkCompact.cpp</in>
+                <in>shenandoahMarkingContext.cpp</in>
+                <in>shenandoahMemoryPool.cpp</in>
+                <in>shenandoahMetrics.cpp</in>
+                <in>shenandoahMonitoringSupport.cpp</in>
+                <in>shenandoahNumberSeq.cpp</in>
+                <in>shenandoahPacer.cpp</in>
+                <in>shenandoahPhaseTimings.cpp</in>
+                <in>shenandoahRootProcessor.cpp</in>
+                <in>shenandoahRuntime.cpp</in>
+                <in>shenandoahSATBMarkQueueSet.cpp</in>
+                <in>shenandoahStrDedupQueue.cpp</in>
+                <in>shenandoahStringDedup.cpp</in>
+                <in>shenandoahTaskqueue.cpp</in>
+                <in>shenandoahTimingTracker.cpp</in>
+                <in>shenandoahTraversalGC.cpp</in>
+                <in>shenandoahUtils.cpp</in>
+                <in>shenandoahVMOperations.cpp</in>
+                <in>shenandoahVerifier.cpp</in>
+                <in>shenandoahWorkGroup.cpp</in>
+                <in>shenandoahWorkerPolicy.cpp</in>
+              </df>
+              <df name="z">
+                <df name="c1">
+                  <in>zBarrierSetC1.cpp</in>
+                </df>
+                <df name="c2">
+                  <in>zBarrierSetC2.cpp</in>
+                </df>
+                <in>vmStructs_z.cpp</in>
+                <in>zAddress.cpp</in>
+                <in>zArguments.cpp</in>
+                <in>zBarrier.cpp</in>
+                <in>zBarrierSet.cpp</in>
+                <in>zBarrierSetAssembler.cpp</in>
+                <in>zBarrierSetNMethod.cpp</in>
+                <in>zBarrierSetRuntime.cpp</in>
+                <in>zCPU.cpp</in>
+                <in>zCollectedHeap.cpp</in>
+                <in>zCollectorPolicy.cpp</in>
+                <in>zDirector.cpp</in>
+                <in>zDriver.cpp</in>
+                <in>zErrno.cpp</in>
+                <in>zForwardingTable.cpp</in>
+                <in>zGlobals.cpp</in>
+                <in>zHeap.cpp</in>
+                <in>zHeapIterator.cpp</in>
+                <in>zInitialize.cpp</in>
+                <in>zLargePages.cpp</in>
+                <in>zLiveMap.cpp</in>
+                <in>zMark.cpp</in>
+                <in>zMarkCache.cpp</in>
+                <in>zMarkStack.cpp</in>
+                <in>zMarkStackAllocator.cpp</in>
+                <in>zMemory.cpp</in>
+                <in>zMetronome.cpp</in>
+                <in>zNMethodTable.cpp</in>
+                <in>zNUMA.cpp</in>
+                <in>zObjectAllocator.cpp</in>
+                <in>zOopClosures.cpp</in>
+                <in>zPage.cpp</in>
+                <in>zPageAllocator.cpp</in>
+                <in>zPageCache.cpp</in>
+                <in>zPageTable.cpp</in>
+                <in>zPhysicalMemory.cpp</in>
+                <in>zPreMappedMemory.cpp</in>
+                <in>zReferenceProcessor.cpp</in>
+                <in>zRelocate.cpp</in>
+                <in>zRelocationSet.cpp</in>
+                <in>zRelocationSetSelector.cpp</in>
+                <in>zResurrection.cpp</in>
+                <in>zRootsIterator.cpp</in>
+                <in>zRuntimeWorkers.cpp</in>
+                <in>zServiceability.cpp</in>
+                <in>zStat.cpp</in>
+                <in>zStatTLAB.cpp</in>
+                <in>zTask.cpp</in>
+                <in>zThread.cpp</in>
+                <in>zTracer.cpp</in>
+                <in>zUnload.cpp</in>
+                <in>zUtils.cpp</in>
+                <in>zVirtualMemory.cpp</in>
+                <in>zWeakRootsProcessor.cpp</in>
+                <in>zWorkers.cpp</in>
               </df>
             </df>
             <df name="interpreter">
               <in>abstractInterpreter.cpp</in>
-              <in>abstractInterpreter.hpp</in>
               <in>bytecode.cpp</in>
-              <in>bytecode.hpp</in>
               <in>bytecodeHistogram.cpp</in>
-              <in>bytecodeHistogram.hpp</in>
               <in>bytecodeInterpreter.cpp</in>
-              <in>bytecodeInterpreter.hpp</in>
-              <in>bytecodeInterpreter.inline.hpp</in>
-              <in>bytecodeInterpreterProfiling.hpp</in>
               <in>bytecodeStream.cpp</in>
-              <in>bytecodeStream.hpp</in>
               <in>bytecodeTracer.cpp</in>
-              <in>bytecodeTracer.hpp</in>
               <in>bytecodes.cpp</in>
-              <in>bytecodes.hpp</in>
               <in>cppInterpreter.cpp</in>
-              <in>cppInterpreter.hpp</in>
               <in>cppInterpreterGenerator.cpp</in>
-              <in>cppInterpreterGenerator.hpp</in>
-              <in>interp_masm.hpp</in>
               <in>interpreter.cpp</in>
-              <in>interpreter.hpp</in>
               <in>interpreterRuntime.cpp</in>
-              <in>interpreterRuntime.hpp</in>
               <in>invocationCounter.cpp</in>
-              <in>invocationCounter.hpp</in>
               <in>linkResolver.cpp</in>
-              <in>linkResolver.hpp</in>
               <in>oopMapCache.cpp</in>
-              <in>oopMapCache.hpp</in>
               <in>rewriter.cpp</in>
-              <in>rewriter.hpp</in>
               <in>templateInterpreter.cpp</in>
-              <in>templateInterpreter.hpp</in>
               <in>templateInterpreterGenerator.cpp</in>
-              <in>templateInterpreterGenerator.hpp</in>
               <in>templateTable.cpp</in>
-              <in>templateTable.hpp</in>
+            </df>
+            <df name="jfr">
+              <df name="dcmd">
+                <in>jfrDcmds.cpp</in>
+              </df>
+              <df name="instrumentation">
+                <in>jfrEventClassTransformer.cpp</in>
+                <in>jfrJvmtiAgent.cpp</in>
+              </df>
+              <df name="jni">
+                <in>jfrGetAllEventClasses.cpp</in>
+                <in>jfrJavaCall.cpp</in>
+                <in>jfrJavaSupport.cpp</in>
+                <in>jfrJniMethod.cpp</in>
+                <in>jfrJniMethodRegistration.cpp</in>
+                <in>jfrUpcalls.cpp</in>
+              </df>
+              <df name="leakprofiler">
+                <df name="chains">
+                  <in>bfsClosure.cpp</in>
+                  <in>bitset.cpp</in>
+                  <in>dfsClosure.cpp</in>
+                  <in>edge.cpp</in>
+                  <in>edgeQueue.cpp</in>
+                  <in>edgeStore.cpp</in>
+                  <in>edgeUtils.cpp</in>
+                  <in>rootSetClosure.cpp</in>
+                </df>
+                <df name="checkpoint">
+                  <in>objectSampleCheckpoint.cpp</in>
+                  <in>objectSampleDescription.cpp</in>
+                  <in>objectSampleWriter.cpp</in>
+                  <in>rootResolver.cpp</in>
+                </df>
+                <df name="sampling">
+                  <in>objectSampler.cpp</in>
+                  <in>sampleList.cpp</in>
+                  <in>samplePriorityQueue.cpp</in>
+                </df>
+                <df name="utilities">
+                  <in>granularTimer.cpp</in>
+                  <in>saveRestore.cpp</in>
+                </df>
+                <in>emitEventOperation.cpp</in>
+                <in>leakProfiler.cpp</in>
+              </df>
+              <df name="periodic">
+                <df name="sampling">
+                  <in>jfrCallTrace.cpp</in>
+                  <in>jfrThreadSampler.cpp</in>
+                </df>
+                <in>jfrModuleEvent.cpp</in>
+                <in>jfrNetworkUtilization.cpp</in>
+                <in>jfrOSInterface.cpp</in>
+                <in>jfrPeriodic.cpp</in>
+                <in>jfrThreadCPULoadEvent.cpp</in>
+                <in>jfrThreadDumpEvent.cpp</in>
+              </df>
+              <df name="recorder">
+                <df name="checkpoint">
+                  <df name="types">
+                    <df name="traceid">
+                      <in>jfrTraceId.cpp</in>
+                      <in>jfrTraceIdEpoch.cpp</in>
+                    </df>
+                    <in>jfrThreadGroup.cpp</in>
+                    <in>jfrThreadState.cpp</in>
+                    <in>jfrType.cpp</in>
+                    <in>jfrTypeManager.cpp</in>
+                    <in>jfrTypeSet.cpp</in>
+                    <in>jfrTypeSetUtils.cpp</in>
+                  </df>
+                  <in>jfrCheckpointBlob.cpp</in>
+                  <in>jfrCheckpointManager.cpp</in>
+                  <in>jfrCheckpointWriter.cpp</in>
+                  <in>jfrMetadataEvent.cpp</in>
+                </df>
+                <df name="repository">
+                  <in>jfrChunkRotation.cpp</in>
+                  <in>jfrChunkState.cpp</in>
+                  <in>jfrChunkWriter.cpp</in>
+                  <in>jfrEmergencyDump.cpp</in>
+                  <in>jfrRepository.cpp</in>
+                </df>
+                <df name="service">
+                  <in>jfrEvent.cpp</in>
+                  <in>jfrMemorySizer.cpp</in>
+                  <in>jfrOptionSet.cpp</in>
+                  <in>jfrPostBox.cpp</in>
+                  <in>jfrRecorderService.cpp</in>
+                  <in>jfrRecorderThread.cpp</in>
+                  <in>jfrRecorderThreadLoop.cpp</in>
+                </df>
+                <df name="stacktrace">
+                  <in>jfrStackTraceRepository.cpp</in>
+                </df>
+                <df name="storage">
+                  <in>jfrBuffer.cpp</in>
+                  <in>jfrStorage.cpp</in>
+                  <in>jfrStorageControl.cpp</in>
+                  <in>jfrVirtualMemory.cpp</in>
+                </df>
+                <df name="stringpool">
+                  <in>jfrStringPool.cpp</in>
+                  <in>jfrStringPoolBuffer.cpp</in>
+                  <in>jfrStringPoolWriter.cpp</in>
+                </df>
+                <in>jfrEventSetting.cpp</in>
+                <in>jfrRecorder.cpp</in>
+              </df>
+              <df name="support">
+                <in>jfrAllocationTracer.cpp</in>
+                <in>jfrEventClass.cpp</in>
+                <in>jfrFlush.cpp</in>
+                <in>jfrStackTraceMark.cpp</in>
+                <in>jfrThreadLocal.cpp</in>
+              </df>
+              <df name="utilities">
+                <in>jfrAllocation.cpp</in>
+                <in>jfrJavaLog.cpp</in>
+                <in>jfrTime.cpp</in>
+                <in>jfrTimeConverter.cpp</in>
+              </df>
+              <df name="writers">
+                <in>jfrJavaEventWriter.cpp</in>
+              </df>
+              <in>jfr.cpp</in>
             </df>
             <df name="jvmci">
               <in>compilerRuntime.cpp</in>
-              <in>compilerRuntime.hpp</in>
               <in>jvmciCodeInstaller.cpp</in>
-              <in>jvmciCodeInstaller.hpp</in>
               <in>jvmciCompiler.cpp</in>
-              <in>jvmciCompiler.hpp</in>
               <in>jvmciCompilerToVM.cpp</in>
-              <in>jvmciCompilerToVM.hpp</in>
+              <in>jvmciCompilerToVMInit.cpp</in>
               <in>jvmciEnv.cpp</in>
-              <in>jvmciEnv.hpp</in>
               <in>jvmciJavaClasses.cpp</in>
-              <in>jvmciJavaClasses.hpp</in>
               <in>jvmciRuntime.cpp</in>
-              <in>jvmciRuntime.hpp</in>
               <in>jvmci_globals.cpp</in>
-              <in>jvmci_globals.hpp</in>
-              <in>systemDictionary_jvmci.hpp</in>
-              <in>vmStructs_compiler_runtime.hpp</in>
               <in>vmStructs_jvmci.cpp</in>
-              <in>vmStructs_jvmci.hpp</in>
-              <in>vmSymbols_jvmci.hpp</in>
             </df>
             <df name="libadt">
               <in>dict.cpp</in>
-              <in>dict.hpp</in>
               <in>set.cpp</in>
-              <in>set.hpp</in>
               <in>vectset.cpp</in>
-              <in>vectset.hpp</in>
             </df>
             <df name="logging">
-              <in>log.hpp</in>
               <in>logConfiguration.cpp</in>
-              <in>logConfiguration.hpp</in>
               <in>logDecorations.cpp</in>
-              <in>logDecorations.hpp</in>
               <in>logDecorators.cpp</in>
-              <in>logDecorators.hpp</in>
               <in>logDiagnosticCommand.cpp</in>
-              <in>logDiagnosticCommand.hpp</in>
               <in>logFileOutput.cpp</in>
-              <in>logFileOutput.hpp</in>
               <in>logFileStreamOutput.cpp</in>
-              <in>logFileStreamOutput.hpp</in>
-              <in>logHandle.hpp</in>
               <in>logLevel.cpp</in>
-              <in>logLevel.hpp</in>
-              <in>logMessage.hpp</in>
               <in>logMessageBuffer.cpp</in>
-              <in>logMessageBuffer.hpp</in>
               <in>logOutput.cpp</in>
-              <in>logOutput.hpp</in>
               <in>logOutputList.cpp</in>
-              <in>logOutputList.hpp</in>
-              <in>logPrefix.hpp</in>
+              <in>logSelection.cpp</in>
+              <in>logSelectionList.cpp</in>
               <in>logStream.cpp</in>
-              <in>logStream.hpp</in>
               <in>logTag.cpp</in>
-              <in>logTag.hpp</in>
-              <in>logTagLevelExpression.cpp</in>
-              <in>logTagLevelExpression.hpp</in>
               <in>logTagSet.cpp</in>
-              <in>logTagSet.hpp</in>
               <in>logTagSetDescriptions.cpp</in>
-              <in>logTagSetDescriptions.hpp</in>
-              <in>logTag_ext.hpp</in>
             </df>
             <df name="memory">
+              <df name="metaspace">
+                <in>blockFreelist.cpp</in>
+                <in>chunkManager.cpp</in>
+                <in>metaDebug.cpp</in>
+                <in>metachunk.cpp</in>
+                <in>metaspaceCommon.cpp</in>
+                <in>metaspaceDCmd.cpp</in>
+                <in>metaspaceStatistics.cpp</in>
+                <in>occupancyMap.cpp</in>
+                <in>printCLDMetaspaceInfoClosure.cpp</in>
+                <in>printMetaspaceInfoKlassClosure.cpp</in>
+                <in>smallBlocks.cpp</in>
+                <in>spaceManager.cpp</in>
+                <in>virtualSpaceList.cpp</in>
+                <in>virtualSpaceNode.cpp</in>
+              </df>
               <in>allocation.cpp</in>
-              <in>allocation.hpp</in>
-              <in>allocation.inline.hpp</in>
               <in>arena.cpp</in>
-              <in>arena.hpp</in>
-              <in>binaryTreeDictionary.cpp</in>
-              <in>binaryTreeDictionary.hpp</in>
               <in>filemap.cpp</in>
-              <in>filemap.hpp</in>
-              <in>freeList.cpp</in>
-              <in>freeList.hpp</in>
               <in>guardedMemory.cpp</in>
-              <in>guardedMemory.hpp</in>
               <in>heap.cpp</in>
-              <in>heap.hpp</in>
               <in>heapInspection.cpp</in>
-              <in>heapInspection.hpp</in>
+              <in>heapShared.cpp</in>
               <in>iterator.cpp</in>
-              <in>iterator.hpp</in>
-              <in>iterator.inline.hpp</in>
               <in>memRegion.cpp</in>
-              <in>memRegion.hpp</in>
-              <in>metachunk.cpp</in>
-              <in>metachunk.hpp</in>
-              <in>metadataFactory.hpp</in>
               <in>metaspace.cpp</in>
-              <in>metaspace.hpp</in>
-              <in>metaspaceChunkFreeListSummary.hpp</in>
               <in>metaspaceClosure.cpp</in>
-              <in>metaspaceClosure.hpp</in>
               <in>metaspaceCounters.cpp</in>
-              <in>metaspaceCounters.hpp</in>
-              <in>metaspaceGCThresholdUpdater.hpp</in>
               <in>metaspaceShared.cpp</in>
-              <in>metaspaceShared.hpp</in>
               <in>metaspaceTracer.cpp</in>
-              <in>metaspaceTracer.hpp</in>
               <in>oopFactory.cpp</in>
-              <in>oopFactory.hpp</in>
               <in>operator_new.cpp</in>
-              <in>padded.hpp</in>
-              <in>padded.inline.hpp</in>
-              <in>referenceType.hpp</in>
               <in>resourceArea.cpp</in>
-              <in>resourceArea.hpp</in>
               <in>universe.cpp</in>
-              <in>universe.hpp</in>
-              <in>universe.inline.hpp</in>
-              <in>universe_ext.cpp</in>
               <in>virtualspace.cpp</in>
-              <in>virtualspace.hpp</in>
-            </df>
-            <df name="metaprogramming">
-              <in>conditional.hpp</in>
-              <in>decay.hpp</in>
-              <in>enableIf.hpp</in>
-              <in>integralConstant.hpp</in>
-              <in>isConst.hpp</in>
-              <in>isFloatingPoint.hpp</in>
-              <in>isIntegral.hpp</in>
-              <in>isPointer.hpp</in>
-              <in>isRegisteredEnum.hpp</in>
-              <in>isSame.hpp</in>
-              <in>isSigned.hpp</in>
-              <in>isVolatile.hpp</in>
-              <in>primitiveConversions.hpp</in>
-              <in>removeCV.hpp</in>
-              <in>removePointer.hpp</in>
-              <in>removeReference.hpp</in>
             </df>
             <df name="oops">
+              <in>access.cpp</in>
+              <in>accessBackend.cpp</in>
               <in>annotations.cpp</in>
-              <in>annotations.hpp</in>
-              <in>array.hpp</in>
               <in>arrayKlass.cpp</in>
-              <in>arrayKlass.hpp</in>
-              <in>arrayKlass.inline.hpp</in>
-              <in>arrayOop.hpp</in>
               <in>compiledICHolder.cpp</in>
-              <in>compiledICHolder.hpp</in>
               <in>constMethod.cpp</in>
-              <in>constMethod.hpp</in>
               <in>constantPool.cpp</in>
-              <in>constantPool.hpp</in>
               <in>cpCache.cpp</in>
-              <in>cpCache.hpp</in>
-              <in>fieldInfo.hpp</in>
-              <in>fieldStreams.hpp</in>
               <in>generateOopMap.cpp</in>
-              <in>generateOopMap.hpp</in>
-              <in>instanceClassLoaderKlass.hpp</in>
-              <in>instanceClassLoaderKlass.inline.hpp</in>
               <in>instanceKlass.cpp</in>
-              <in>instanceKlass.hpp</in>
-              <in>instanceKlass.inline.hpp</in>
               <in>instanceMirrorKlass.cpp</in>
-              <in>instanceMirrorKlass.hpp</in>
-              <in>instanceMirrorKlass.inline.hpp</in>
               <in>instanceOop.cpp</in>
-              <in>instanceOop.hpp</in>
               <in>instanceRefKlass.cpp</in>
-              <in>instanceRefKlass.hpp</in>
-              <in>instanceRefKlass.inline.hpp</in>
               <in>klass.cpp</in>
-              <in>klass.hpp</in>
-              <in>klass.inline.hpp</in>
               <in>klassVtable.cpp</in>
-              <in>klassVtable.hpp</in>
               <in>markOop.cpp</in>
-              <in>markOop.hpp</in>
-              <in>markOop.inline.hpp</in>
               <in>metadata.cpp</in>
-              <in>metadata.hpp</in>
               <in>method.cpp</in>
-              <in>method.hpp</in>
               <in>methodCounters.cpp</in>
-              <in>methodCounters.hpp</in>
               <in>methodData.cpp</in>
-              <in>methodData.hpp</in>
               <in>objArrayKlass.cpp</in>
-              <in>objArrayKlass.hpp</in>
-              <in>objArrayKlass.inline.hpp</in>
               <in>objArrayOop.cpp</in>
-              <in>objArrayOop.hpp</in>
-              <in>objArrayOop.inline.hpp</in>
               <in>oop.cpp</in>
-              <in>oop.hpp</in>
-              <in>oop.inline.hpp</in>
-              <in>oopHandle.hpp</in>
               <in>oopsHierarchy.cpp</in>
-              <in>oopsHierarchy.hpp</in>
+              <in>reflectionAccessorImplKlassHelper.cpp</in>
               <in>symbol.cpp</in>
-              <in>symbol.hpp</in>
               <in>typeArrayKlass.cpp</in>
-              <in>typeArrayKlass.hpp</in>
-              <in>typeArrayKlass.inline.hpp</in>
-              <in>typeArrayOop.hpp</in>
-              <in>typeArrayOop.inline.hpp</in>
-              <in>verifyOopClosure.hpp</in>
+              <in>weakHandle.cpp</in>
             </df>
             <df name="opto">
-              <in>ad.hpp</in>
               <in>addnode.cpp</in>
-              <in>addnode.hpp</in>
-              <in>adlcVMDeps.hpp</in>
               <in>arraycopynode.cpp</in>
-              <in>arraycopynode.hpp</in>
               <in>block.cpp</in>
-              <in>block.hpp</in>
               <in>buildOopMap.cpp</in>
               <in>bytecodeInfo.cpp</in>
               <in>c2_globals.cpp</in>
-              <in>c2_globals.hpp</in>
               <in>c2compiler.cpp</in>
-              <in>c2compiler.hpp</in>
               <in>callGenerator.cpp</in>
-              <in>callGenerator.hpp</in>
               <in>callnode.cpp</in>
-              <in>callnode.hpp</in>
               <in>castnode.cpp</in>
-              <in>castnode.hpp</in>
               <in>cfgnode.cpp</in>
-              <in>cfgnode.hpp</in>
               <in>chaitin.cpp</in>
-              <in>chaitin.hpp</in>
               <in>classes.cpp</in>
-              <in>classes.hpp</in>
               <in>coalesce.cpp</in>
-              <in>coalesce.hpp</in>
               <in>compile.cpp</in>
-              <in>compile.hpp</in>
               <in>connode.cpp</in>
-              <in>connode.hpp</in>
               <in>convertnode.cpp</in>
-              <in>convertnode.hpp</in>
               <in>countbitsnode.cpp</in>
-              <in>countbitsnode.hpp</in>
               <in>divnode.cpp</in>
-              <in>divnode.hpp</in>
               <in>doCall.cpp</in>
               <in>domgraph.cpp</in>
               <in>escape.cpp</in>
-              <in>escape.hpp</in>
               <in>gcm.cpp</in>
               <in>generateOptoStub.cpp</in>
               <in>graphKit.cpp</in>
-              <in>graphKit.hpp</in>
               <in>idealGraphPrinter.cpp</in>
-              <in>idealGraphPrinter.hpp</in>
               <in>idealKit.cpp</in>
-              <in>idealKit.hpp</in>
               <in>ifg.cpp</in>
               <in>ifnode.cpp</in>
               <in>indexSet.cpp</in>
-              <in>indexSet.hpp</in>
               <in>intrinsicnode.cpp</in>
-              <in>intrinsicnode.hpp</in>
               <in>lcm.cpp</in>
               <in>library_call.cpp</in>
               <in>live.cpp</in>
-              <in>live.hpp</in>
               <in>locknode.cpp</in>
-              <in>locknode.hpp</in>
               <in>loopPredicate.cpp</in>
               <in>loopTransform.cpp</in>
               <in>loopUnswitch.cpp</in>
               <in>loopnode.cpp</in>
-              <in>loopnode.hpp</in>
               <in>loopopts.cpp</in>
               <in>machnode.cpp</in>
-              <in>machnode.hpp</in>
               <in>macro.cpp</in>
-              <in>macro.hpp</in>
               <in>macroArrayCopy.cpp</in>
               <in>matcher.cpp</in>
-              <in>matcher.hpp</in>
               <in>mathexactnode.cpp</in>
-              <in>mathexactnode.hpp</in>
               <in>memnode.cpp</in>
-              <in>memnode.hpp</in>
               <in>movenode.cpp</in>
-              <in>movenode.hpp</in>
               <in>mulnode.cpp</in>
-              <in>mulnode.hpp</in>
               <in>multnode.cpp</in>
-              <in>multnode.hpp</in>
               <in>narrowptrnode.cpp</in>
-              <in>narrowptrnode.hpp</in>
               <in>node.cpp</in>
-              <in>node.hpp</in>
               <in>opaquenode.cpp</in>
-              <in>opaquenode.hpp</in>
               <in>opcodes.cpp</in>
-              <in>opcodes.hpp</in>
-              <in>optoreg.hpp</in>
               <in>output.cpp</in>
-              <in>output.hpp</in>
-              <in>parse.hpp</in>
               <in>parse1.cpp</in>
               <in>parse2.cpp</in>
               <in>parse3.cpp</in>
               <in>parseHelper.cpp</in>
               <in>phase.cpp</in>
-              <in>phase.hpp</in>
               <in>phaseX.cpp</in>
-              <in>phaseX.hpp</in>
-              <in>phasetype.hpp</in>
               <in>postaloc.cpp</in>
               <in>reg_split.cpp</in>
               <in>regalloc.cpp</in>
-              <in>regalloc.hpp</in>
               <in>regmask.cpp</in>
-              <in>regmask.hpp</in>
               <in>replacednodes.cpp</in>
-              <in>replacednodes.hpp</in>
               <in>rootnode.cpp</in>
-              <in>rootnode.hpp</in>
               <in>runtime.cpp</in>
-              <in>runtime.hpp</in>
               <in>split_if.cpp</in>
               <in>stringopts.cpp</in>
-              <in>stringopts.hpp</in>
               <in>subnode.cpp</in>
-              <in>subnode.hpp</in>
               <in>superword.cpp</in>
-              <in>superword.hpp</in>
               <in>type.cpp</in>
-              <in>type.hpp</in>
               <in>vectornode.cpp</in>
-              <in>vectornode.hpp</in>
-            </df>
-            <df name="precompiled">
-              <in>precompiled.hpp</in>
             </df>
             <df name="prims">
               <df name="wbtestmethods">
                 <in>parserTests.cpp</in>
-                <in>parserTests.hpp</in>
               </df>
+              <in>cdsoffsets.cpp</in>
               <in>evmCompat.cpp</in>
               <in>forte.cpp</in>
-              <in>forte.hpp</in>
               <in>jni.cpp</in>
-              <in>jni.h</in>
               <in>jniCheck.cpp</in>
-              <in>jniCheck.hpp</in>
-              <in>jniExport.hpp</in>
               <in>jniFastGetField.cpp</in>
-              <in>jniFastGetField.hpp</in>
-              <in>jni_md.h</in>
               <in>jvm.cpp</in>
-              <in>jvm.h</in>
-              <in>jvm_misc.hpp</in>
-              <in>jvmtiAgentThread.hpp</in>
               <in>jvmtiClassFileReconstituter.cpp</in>
-              <in>jvmtiClassFileReconstituter.hpp</in>
               <in>jvmtiCodeBlobEvents.cpp</in>
-              <in>jvmtiCodeBlobEvents.hpp</in>
-              <in>jvmtiEnter.inline.hpp</in>
               <in>jvmtiEnv.cpp</in>
               <in>jvmtiEnvBase.cpp</in>
-              <in>jvmtiEnvBase.hpp</in>
               <in>jvmtiEnvThreadState.cpp</in>
-              <in>jvmtiEnvThreadState.hpp</in>
               <in>jvmtiEventController.cpp</in>
-              <in>jvmtiEventController.hpp</in>
-              <in>jvmtiEventController.inline.hpp</in>
               <in>jvmtiExport.cpp</in>
-              <in>jvmtiExport.hpp</in>
               <in>jvmtiExtensions.cpp</in>
-              <in>jvmtiExtensions.hpp</in>
               <in>jvmtiGetLoadedClasses.cpp</in>
-              <in>jvmtiGetLoadedClasses.hpp</in>
               <in>jvmtiImpl.cpp</in>
-              <in>jvmtiImpl.hpp</in>
               <in>jvmtiManageCapabilities.cpp</in>
-              <in>jvmtiManageCapabilities.hpp</in>
               <in>jvmtiRawMonitor.cpp</in>
-              <in>jvmtiRawMonitor.hpp</in>
               <in>jvmtiRedefineClasses.cpp</in>
-              <in>jvmtiRedefineClasses.hpp</in>
               <in>jvmtiTagMap.cpp</in>
-              <in>jvmtiTagMap.hpp</in>
               <in>jvmtiThreadState.cpp</in>
-              <in>jvmtiThreadState.hpp</in>
-              <in>jvmtiThreadState.inline.hpp</in>
               <in>jvmtiTrace.cpp</in>
-              <in>jvmtiTrace.hpp</in>
               <in>jvmtiUtil.cpp</in>
-              <in>jvmtiUtil.hpp</in>
               <in>methodComparator.cpp</in>
-              <in>methodComparator.hpp</in>
               <in>methodHandles.cpp</in>
-              <in>methodHandles.hpp</in>
               <in>nativeLookup.cpp</in>
-              <in>nativeLookup.hpp</in>
               <in>perf.cpp</in>
-              <in>privilegedStack.cpp</in>
-              <in>privilegedStack.hpp</in>
               <in>resolvedMethodTable.cpp</in>
-              <in>resolvedMethodTable.hpp</in>
               <in>stackwalk.cpp</in>
-              <in>stackwalk.hpp</in>
               <in>unsafe.cpp</in>
-              <in>unsafe.hpp</in>
               <in>whitebox.cpp</in>
-              <in>whitebox.hpp</in>
-              <in>whitebox_ext.cpp</in>
             </df>
             <df name="runtime">
-              <in>advancedThresholdPolicy.cpp</in>
-              <in>advancedThresholdPolicy.hpp</in>
+              <df name="flags">
+                <in>jvmFlag.cpp</in>
+                <in>jvmFlagConstraintList.cpp</in>
+                <in>jvmFlagConstraintsCompiler.cpp</in>
+                <in>jvmFlagConstraintsRuntime.cpp</in>
+                <in>jvmFlagRangeList.cpp</in>
+                <in>jvmFlagWriteableList.cpp</in>
+              </df>
               <in>arguments.cpp</in>
-              <in>arguments.hpp</in>
               <in>arguments_ext.cpp</in>
-              <in>atomic.hpp</in>
               <in>basicLock.cpp</in>
-              <in>basicLock.hpp</in>
               <in>biasedLocking.cpp</in>
-              <in>biasedLocking.hpp</in>
-              <in>commandLineFlagConstraintList.cpp</in>
-              <in>commandLineFlagConstraintList.hpp</in>
-              <in>commandLineFlagConstraintsCompiler.cpp</in>
-              <in>commandLineFlagConstraintsCompiler.hpp</in>
-              <in>commandLineFlagConstraintsGC.cpp</in>
-              <in>commandLineFlagConstraintsGC.hpp</in>
-              <in>commandLineFlagConstraintsRuntime.cpp</in>
-              <in>commandLineFlagConstraintsRuntime.hpp</in>
-              <in>commandLineFlagRangeList.cpp</in>
-              <in>commandLineFlagRangeList.hpp</in>
-              <in>commandLineFlagWriteableList.cpp</in>
-              <in>commandLineFlagWriteableList.hpp</in>
               <in>compilationPolicy.cpp</in>
-              <in>compilationPolicy.hpp</in>
               <in>deoptimization.cpp</in>
-              <in>deoptimization.hpp</in>
-              <in>extendedPC.hpp</in>
               <in>fieldDescriptor.cpp</in>
-              <in>fieldDescriptor.hpp</in>
               <in>fieldType.cpp</in>
-              <in>fieldType.hpp</in>
               <in>frame.cpp</in>
-              <in>frame.hpp</in>
-              <in>frame.inline.hpp</in>
               <in>globals.cpp</in>
-              <in>globals.hpp</in>
-              <in>globals_ext.hpp</in>
-              <in>globals_extension.hpp</in>
               <in>handles.cpp</in>
-              <in>handles.hpp</in>
-              <in>handles.inline.hpp</in>
+              <in>handshake.cpp</in>
               <in>icache.cpp</in>
-              <in>icache.hpp</in>
               <in>init.cpp</in>
-              <in>init.hpp</in>
               <in>interfaceSupport.cpp</in>
-              <in>interfaceSupport.hpp</in>
               <in>java.cpp</in>
-              <in>java.hpp</in>
               <in>javaCalls.cpp</in>
-              <in>javaCalls.hpp</in>
-              <in>javaFrameAnchor.hpp</in>
-              <in>jfieldIDWorkaround.hpp</in>
               <in>jniHandles.cpp</in>
-              <in>jniHandles.hpp</in>
               <in>jniPeriodicChecker.cpp</in>
-              <in>jniPeriodicChecker.hpp</in>
               <in>memprofiler.cpp</in>
-              <in>memprofiler.hpp</in>
               <in>monitorChunk.cpp</in>
-              <in>monitorChunk.hpp</in>
               <in>mutex.cpp</in>
-              <in>mutex.hpp</in>
               <in>mutexLocker.cpp</in>
-              <in>mutexLocker.hpp</in>
               <in>objectMonitor.cpp</in>
-              <in>objectMonitor.hpp</in>
-              <in>objectMonitor.inline.hpp</in>
               <in>orderAccess.cpp</in>
-              <in>orderAccess.hpp</in>
-              <in>orderAccess.inline.hpp</in>
               <in>os.cpp</in>
-              <in>os.hpp</in>
-              <in>os.inline.hpp</in>
               <in>osThread.cpp</in>
-              <in>osThread.hpp</in>
-              <in>os_ext.hpp</in>
               <in>park.cpp</in>
-              <in>park.hpp</in>
               <in>perfData.cpp</in>
-              <in>perfData.hpp</in>
               <in>perfMemory.cpp</in>
-              <in>perfMemory.hpp</in>
-              <in>prefetch.hpp</in>
-              <in>prefetch.inline.hpp</in>
               <in>reflection.cpp</in>
-              <in>reflection.hpp</in>
               <in>reflectionUtils.cpp</in>
-              <in>reflectionUtils.hpp</in>
-              <in>registerMap.hpp</in>
               <in>relocator.cpp</in>
-              <in>relocator.hpp</in>
               <in>rframe.cpp</in>
-              <in>rframe.hpp</in>
               <in>rtmLocking.cpp</in>
-              <in>rtmLocking.hpp</in>
               <in>safepoint.cpp</in>
-              <in>safepoint.hpp</in>
-              <in>semaphore.hpp</in>
+              <in>safepointMechanism.cpp</in>
+              <in>safepointVerifiers.cpp</in>
               <in>serviceThread.cpp</in>
-              <in>serviceThread.hpp</in>
               <in>sharedRuntime.cpp</in>
-              <in>sharedRuntime.hpp</in>
-              <in>sharedRuntimeMath.hpp</in>
               <in>sharedRuntimeTrans.cpp</in>
               <in>sharedRuntimeTrig.cpp</in>
               <in>signature.cpp</in>
-              <in>signature.hpp</in>
-              <in>simpleThresholdPolicy.cpp</in>
-              <in>simpleThresholdPolicy.hpp</in>
-              <in>simpleThresholdPolicy.inline.hpp</in>
               <in>stackValue.cpp</in>
-              <in>stackValue.hpp</in>
               <in>stackValueCollection.cpp</in>
-              <in>stackValueCollection.hpp</in>
               <in>statSampler.cpp</in>
-              <in>statSampler.hpp</in>
               <in>stubCodeGenerator.cpp</in>
-              <in>stubCodeGenerator.hpp</in>
               <in>stubRoutines.cpp</in>
-              <in>stubRoutines.hpp</in>
               <in>sweeper.cpp</in>
-              <in>sweeper.hpp</in>
               <in>synchronizer.cpp</in>
-              <in>synchronizer.hpp</in>
               <in>task.cpp</in>
-              <in>task.hpp</in>
               <in>thread.cpp</in>
-              <in>thread.hpp</in>
-              <in>thread.inline.hpp</in>
-              <in>threadCritical.hpp</in>
-              <in>threadLocalStorage.hpp</in>
-              <in>thread_ext.cpp</in>
-              <in>thread_ext.hpp</in>
+              <in>threadHeapSampler.cpp</in>
+              <in>threadSMR.cpp</in>
+              <in>tieredThresholdPolicy.cpp</in>
               <in>timer.cpp</in>
-              <in>timer.hpp</in>
               <in>timerTrace.cpp</in>
-              <in>timerTrace.hpp</in>
               <in>unhandledOops.cpp</in>
-              <in>unhandledOops.hpp</in>
               <in>vframe.cpp</in>
-              <in>vframe.hpp</in>
               <in>vframeArray.cpp</in>
-              <in>vframeArray.hpp</in>
               <in>vframe_hp.cpp</in>
-              <in>vframe_hp.hpp</in>
+              <in>vmOperations.cpp</in>
               <in>vmStructs.cpp</in>
-              <in>vmStructs.hpp</in>
-              <in>vmStructs_ext.hpp</in>
-              <in>vmStructs_trace.hpp</in>
               <in>vmThread.cpp</in>
-              <in>vmThread.hpp</in>
-              <in>vm_operations.cpp</in>
-              <in>vm_operations.hpp</in>
               <in>vm_version.cpp</in>
-              <in>vm_version.hpp</in>
             </df>
             <df name="services">
-              <in>allocationContextService.hpp</in>
-              <in>allocationSite.hpp</in>
               <in>attachListener.cpp</in>
-              <in>attachListener.hpp</in>
               <in>classLoadingService.cpp</in>
-              <in>classLoadingService.hpp</in>
               <in>diagnosticArgument.cpp</in>
-              <in>diagnosticArgument.hpp</in>
               <in>diagnosticCommand.cpp</in>
-              <in>diagnosticCommand.hpp</in>
               <in>diagnosticFramework.cpp</in>
-              <in>diagnosticFramework.hpp</in>
               <in>dtraceAttacher.cpp</in>
-              <in>dtraceAttacher.hpp</in>
-              <in>g1MemoryPool.cpp</in>
-              <in>g1MemoryPool.hpp</in>
               <in>gcNotifier.cpp</in>
-              <in>gcNotifier.hpp</in>
               <in>heapDumper.cpp</in>
-              <in>heapDumper.hpp</in>
-              <in>jmm.h</in>
               <in>lowMemoryDetector.cpp</in>
-              <in>lowMemoryDetector.hpp</in>
               <in>mallocSiteTable.cpp</in>
-              <in>mallocSiteTable.hpp</in>
               <in>mallocTracker.cpp</in>
-              <in>mallocTracker.hpp</in>
-              <in>mallocTracker.inline.hpp</in>
               <in>management.cpp</in>
-              <in>management.hpp</in>
               <in>memBaseline.cpp</in>
-              <in>memBaseline.hpp</in>
               <in>memReporter.cpp</in>
-              <in>memReporter.hpp</in>
               <in>memTracker.cpp</in>
-              <in>memTracker.hpp</in>
               <in>memoryManager.cpp</in>
-              <in>memoryManager.hpp</in>
               <in>memoryPool.cpp</in>
-              <in>memoryPool.hpp</in>
               <in>memoryService.cpp</in>
-              <in>memoryService.hpp</in>
-              <in>memoryUsage.hpp</in>
               <in>nmtCommon.cpp</in>
-              <in>nmtCommon.hpp</in>
               <in>nmtDCmd.cpp</in>
-              <in>nmtDCmd.hpp</in>
-              <in>psMemoryPool.cpp</in>
-              <in>psMemoryPool.hpp</in>
               <in>runtimeService.cpp</in>
-              <in>runtimeService.hpp</in>
-              <in>serviceUtil.hpp</in>
               <in>threadService.cpp</in>
-              <in>threadService.hpp</in>
               <in>virtualMemoryTracker.cpp</in>
-              <in>virtualMemoryTracker.hpp</in>
               <in>writeableFlags.cpp</in>
-              <in>writeableFlags.hpp</in>
-            </df>
-            <df name="shark">
-              <in>llvmHeaders.hpp</in>
-              <in>llvmValue.hpp</in>
-              <in>sharkBlock.cpp</in>
-              <in>sharkBlock.hpp</in>
-              <in>sharkBuilder.cpp</in>
-              <in>sharkBuilder.hpp</in>
-              <in>sharkCacheDecache.cpp</in>
-              <in>sharkCacheDecache.hpp</in>
-              <in>sharkCodeBuffer.hpp</in>
-              <in>sharkCompiler.cpp</in>
-              <in>sharkCompiler.hpp</in>
-              <in>sharkConstant.cpp</in>
-              <in>sharkConstant.hpp</in>
-              <in>sharkContext.cpp</in>
-              <in>sharkContext.hpp</in>
-              <in>sharkEntry.hpp</in>
-              <in>sharkFunction.cpp</in>
-              <in>sharkFunction.hpp</in>
-              <in>sharkInliner.cpp</in>
-              <in>sharkInliner.hpp</in>
-              <in>sharkIntrinsics.cpp</in>
-              <in>sharkIntrinsics.hpp</in>
-              <in>sharkInvariants.cpp</in>
-              <in>sharkInvariants.hpp</in>
-              <in>sharkMemoryManager.cpp</in>
-              <in>sharkMemoryManager.hpp</in>
-              <in>sharkNativeWrapper.cpp</in>
-              <in>sharkNativeWrapper.hpp</in>
-              <in>sharkRuntime.cpp</in>
-              <in>sharkRuntime.hpp</in>
-              <in>sharkStack.cpp</in>
-              <in>sharkStack.hpp</in>
-              <in>sharkState.cpp</in>
-              <in>sharkState.hpp</in>
-              <in>sharkStateScanner.cpp</in>
-              <in>sharkStateScanner.hpp</in>
-              <in>sharkTopLevelBlock.cpp</in>
-              <in>sharkTopLevelBlock.hpp</in>
-              <in>sharkType.hpp</in>
-              <in>sharkValue.cpp</in>
-              <in>sharkValue.hpp</in>
-              <in>shark_globals.cpp</in>
-              <in>shark_globals.hpp</in>
-            </df>
-            <df name="trace">
-              <in>noTraceBackend.hpp</in>
-              <in>traceBackend.cpp</in>
-              <in>traceBackend.hpp</in>
-              <in>traceDataTypes.hpp</in>
-              <in>traceEvent.hpp</in>
-              <in>traceMacros.hpp</in>
-              <in>traceStream.cpp</in>
-              <in>traceStream.hpp</in>
-              <in>traceTime.hpp</in>
-              <in>tracing.hpp</in>
-              <in>xinclude.mod</in>
             </df>
             <df name="utilities">
               <in>accessFlags.cpp</in>
-              <in>accessFlags.hpp</in>
-              <in>align.hpp</in>
               <in>bitMap.cpp</in>
-              <in>bitMap.hpp</in>
-              <in>bitMap.inline.hpp</in>
-              <in>breakpoint.hpp</in>
-              <in>bytes.hpp</in>
-              <in>chunkedList.hpp</in>
-              <in>compilerWarnings.hpp</in>
               <in>constantTag.cpp</in>
-              <in>constantTag.hpp</in>
               <in>copy.cpp</in>
-              <in>copy.hpp</in>
-              <in>count_trailing_zeros.hpp</in>
               <in>debug.cpp</in>
-              <in>debug.hpp</in>
               <in>decoder.cpp</in>
-              <in>decoder.hpp</in>
               <in>decoder_elf.cpp</in>
-              <in>decoder_elf.hpp</in>
-              <in>defaultStream.hpp</in>
-              <in>dtrace.hpp</in>
-              <in>dtrace_disabled.hpp</in>
               <in>elfFile.cpp</in>
-              <in>elfFile.hpp</in>
               <in>elfFuncDescTable.cpp</in>
-              <in>elfFuncDescTable.hpp</in>
               <in>elfStringTable.cpp</in>
-              <in>elfStringTable.hpp</in>
               <in>elfSymbolTable.cpp</in>
-              <in>elfSymbolTable.hpp</in>
               <in>events.cpp</in>
-              <in>events.hpp</in>
               <in>exceptions.cpp</in>
-              <in>exceptions.hpp</in>
-              <in>fakeRttiSupport.hpp</in>
               <in>formatBuffer.cpp</in>
-              <in>formatBuffer.hpp</in>
+              <in>globalCounter.cpp</in>
               <in>globalDefinitions.cpp</in>
-              <in>globalDefinitions.hpp</in>
-              <in>globalDefinitions_gcc.hpp</in>
-              <in>globalDefinitions_solstudio.hpp</in>
-              <in>globalDefinitions_visCPP.hpp</in>
-              <in>globalDefinitions_xlc.hpp</in>
               <in>growableArray.cpp</in>
-              <in>growableArray.hpp</in>
               <in>hashtable.cpp</in>
-              <in>hashtable.hpp</in>
-              <in>hashtable.inline.hpp</in>
               <in>histogram.cpp</in>
-              <in>histogram.hpp</in>
               <in>intHisto.cpp</in>
-              <in>intHisto.hpp</in>
-              <in>internalVMTests.cpp</in>
-              <in>internalVMTests.hpp</in>
               <in>json.cpp</in>
-              <in>json.hpp</in>
-              <in>linkedlist.hpp</in>
-              <in>macros.hpp</in>
               <in>nativeCallStack.cpp</in>
-              <in>nativeCallStack.hpp</in>
               <in>numberSeq.cpp</in>
-              <in>numberSeq.hpp</in>
               <in>ostream.cpp</in>
-              <in>ostream.hpp</in>
-              <in>pair.hpp</in>
               <in>preserveException.cpp</in>
-              <in>preserveException.hpp</in>
-              <in>quickSort.hpp</in>
-              <in>resourceHash.hpp</in>
+              <in>singleWriterSynchronizer.cpp</in>
               <in>sizes.cpp</in>
-              <in>sizes.hpp</in>
-              <in>stack.hpp</in>
-              <in>stack.inline.hpp</in>
+              <in>spinYield.cpp</in>
               <in>stringUtils.cpp</in>
-              <in>stringUtils.hpp</in>
               <in>ticks.cpp</in>
-              <in>ticks.hpp</in>
               <in>utf8.cpp</in>
-              <in>utf8.hpp</in>
               <in>vmError.cpp</in>
-              <in>vmError.hpp</in>
               <in>xmlstream.cpp</in>
-              <in>xmlstream.hpp</in>
             </df>
-            <in>Xusage.txt</in>
           </df>
         </df>
         <df name="java.base">
-          <df name="aix">
-            <df name="native">
-              <df name="libjava">
-                <in>ProcessHandleImpl_aix.c</in>
-              </df>
-              <df name="libjli">
-                <in>java_md_aix.c</in>
-                <in>java_md_aix.h</in>
-              </df>
-              <df name="libjsig">
-                <in>jsig.c</in>
-              </df>
-              <df name="libnet">
-                <in>aix_close.c</in>
-              </df>
-              <df name="libnio">
-                <df name="ch">
-                  <in>AixPollPort.c</in>
-                </df>
-                <df name="fs">
-                  <in>AixNativeDispatcher.c</in>
-                </df>
-              </df>
-            </df>
-          </df>
           <df name="linux">
             <df name="native">
               <df name="libjava">
                 <in>ProcessHandleImpl_linux.c</in>
               </df>
-              <df name="libjsig">
-                <in>jsig.c</in>
-              </df>
               <df name="libnet">
                 <in>linux_close.c</in>
               </df>
               <df name="libnio">
                 <df name="ch">
                   <in>EPoll.c</in>
-                  <in>EPollArrayWrapper.c</in>
-                  <in>EPollPort.c</in>
                 </df>
                 <df name="fs">
                   <in>LinuxNativeDispatcher.c</in>
                   <in>LinuxWatchService.c</in>
                 </df>
               </df>
             </df>
           </df>
-          <df name="macosx">
-            <df name="native">
-              <df name="include">
-                <in>jni_md.h</in>
-                <in>jvm_md.h</in>
-              </df>
-              <df name="libjava">
-                <in>HostLocaleProviderAdapter_md.c</in>
-                <in>ProcessHandleImpl_macosx.c</in>
-                <in>java_props_macosx.c</in>
-                <in>java_props_macosx.h</in>
-              </df>
-              <df name="libjli">
-                <in>java_md_macosx.c</in>
-                <in>java_md_macosx.h</in>
-              </df>
-              <df name="libjsig">
-                <in>jsig.c</in>
-              </df>
-              <df name="libnet">
-                <in>DefaultProxySelector.c</in>
-                <in>bsd_close.c</in>
-              </df>
-              <df name="libnio">
-                <df name="ch">
-                  <in>KQueue.c</in>
-                  <in>KQueueArrayWrapper.c</in>
-                  <in>KQueuePort.c</in>
-                </df>
-                <df name="fs">
-                  <in>BsdNativeDispatcher.c</in>
-                  <in>MacOSXNativeDispatcher.c</in>
-                  <in>UTIFileTypeDetector.c</in>
-                </df>
-              </df>
-              <df name="libosxsecurity">
-                <in>KeystoreImpl.m</in>
-              </df>
-            </df>
-          </df>
           <df name="share">
-            <df name="classes">
-              <df name="jdk">
-                <df name="internal">
-                  <df name="org">
-                    <df name="objectweb">
-                      <df name="asm">
-                        <in>version.txt</in>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="conf">
-              <df name="security">
-                <df name="policy">
-                  <in>README.txt</in>
-                </df>
-              </df>
-            </df>
             <df name="native">
-              <df name="include">
-                <in>classfile_constants.h</in>
-                <in>jni.h</in>
-                <in>jvm.h</in>
-                <in>jvmticmlr.h</in>
-              </df>
               <df name="launcher">
-                <in>defines.h</in>
                 <in>main.c</in>
               </df>
               <df name="libfdlibm">
                 <in>e_acos.c</in>
                 <in>e_asin.c</in>

@@ -3033,12 +1206,10 @@
                 <in>e_rem_pio2.c</in>
                 <in>e_remainder.c</in>
                 <in>e_scalb.c</in>
                 <in>e_sinh.c</in>
                 <in>e_sqrt.c</in>
-                <in>fdlibm.h</in>
-                <in>jfdlibm.h</in>
                 <in>k_cos.c</in>
                 <in>k_rem_pio2.c</in>
                 <in>k_sin.c</in>
                 <in>k_standard.c</in>
                 <in>k_tan.c</in>

@@ -3117,146 +1288,57 @@
                 <in>Throwable.c</in>
                 <in>TimeZone.c</in>
                 <in>VM.c</in>
                 <in>VMSupport.c</in>
                 <in>check_version.c</in>
-                <in>gdefs.h</in>
                 <in>io_util.c</in>
-                <in>io_util.h</in>
-                <in>java_props.h</in>
                 <in>jdk_util.c</in>
-                <in>jdk_util.h</in>
                 <in>jio.c</in>
-                <in>jlong.h</in>
                 <in>jni_util.c</in>
-                <in>jni_util.h</in>
-                <in>sizecalc.h</in>
                 <in>verify_stub.c</in>
               </df>
               <df name="libjimage">
                 <in>NativeImageBuffer.cpp</in>
                 <in>endian.cpp</in>
-                <in>endian.hpp</in>
                 <in>imageDecompressor.cpp</in>
-                <in>imageDecompressor.hpp</in>
                 <in>imageFile.cpp</in>
-                <in>imageFile.hpp</in>
-                <in>inttypes.hpp</in>
                 <in>jimage.cpp</in>
-                <in>jimage.hpp</in>
-                <in>osSupport.hpp</in>
               </df>
               <df name="libjli">
                 <in>args.c</in>
-                <in>emessages.h</in>
                 <in>java.c</in>
-                <in>java.h</in>
                 <in>jli_util.c</in>
-                <in>jli_util.h</in>
-                <in>manifest_info.h</in>
                 <in>parse_manifest.c</in>
-                <in>splashscreen.h</in>
                 <in>splashscreen_stubs.c</in>
                 <in>wildcard.c</in>
-                <in>wildcard.h</in>
               </df>
               <df name="libnet">
                 <in>DatagramPacket.c</in>
                 <in>Inet4Address.c</in>
                 <in>Inet6Address.c</in>
                 <in>InetAddress.c</in>
                 <in>net_util.c</in>
-                <in>net_util.h</in>
                 <in>proxy_util.c</in>
-                <in>proxy_util.h</in>
               </df>
               <df name="libnio">
-                <df name="ch">
-                  <in>nio.h</in>
-                </df>
                 <in>nio_util.c</in>
               </df>
               <df name="libverify">
                 <in>check_code.c</in>
                 <in>check_format.c</in>
-                <in>opcodes.in_out</in>
               </df>
               <df name="libzip">
-                <df name="zlib">
-                  <in>compress.c</in>
-                  <in>crc32.h</in>
-                  <in>deflate.c</in>
-                  <in>deflate.h</in>
-                  <in>gzclose.c</in>
-                  <in>gzguts.h</in>
-                  <in>gzlib.c</in>
-                  <in>gzread.c</in>
-                  <in>gzwrite.c</in>
-                  <in>infback.c</in>
-                  <in>inffast.c</in>
-                  <in>inffast.h</in>
-                  <in>inffixed.h</in>
-                  <in>inflate.c</in>
-                  <in>inflate.h</in>
-                  <in>inftrees.c</in>
-                  <in>inftrees.h</in>
-                  <in>trees.c</in>
-                  <in>trees.h</in>
-                  <in>uncompr.c</in>
-                  <in>zadler32.c</in>
-                  <in>zconf.h</in>
-                  <in>zcrc32.c</in>
-                  <in>zlib.h</in>
-                  <in>zutil.c</in>
-                  <in>zutil.h</in>
-                </df>
                 <in>Adler32.c</in>
                 <in>CRC32.c</in>
                 <in>Deflater.c</in>
                 <in>Inflater.c</in>
                 <in>zip_util.c</in>
-                <in>zip_util.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="solaris">
-            <df name="native">
-              <df name="libjava">
-                <in>ProcessHandleImpl_solaris.c</in>
-              </df>
-              <df name="libjsig">
-                <in>jsig.c</in>
-              </df>
-              <df name="libjvm_db">
-                <in>libjvm_db.c</in>
-                <in>libjvm_db.h</in>
-              </df>
-              <df name="libjvm_dtrace">
-                <in>jvm_dtrace.c</in>
-                <in>jvm_dtrace.h</in>
-              </df>
-              <df name="libnet">
-                <in>solaris_close.c</in>
-              </df>
-              <df name="libnio">
-                <df name="ch">
-                  <in>DevPollArrayWrapper.c</in>
-                  <in>SolarisEventPort.c</in>
-                </df>
-                <df name="fs">
-                  <in>SolarisNativeDispatcher.c</in>
-                  <in>SolarisWatchService.c</in>
-                </df>
               </df>
             </df>
           </df>
           <df name="unix">
             <df name="native">
-              <df name="include">
-                <in>jni_md.h</in>
-                <in>jvm_md.h</in>
-              </df>
               <df name="jspawnhelper">
                 <in>jspawnhelper.c</in>
               </df>
               <df name="launcher">
                 <in>jexec.c</in>

@@ -3265,37 +1347,30 @@
                 <in>Console_md.c</in>
                 <in>FileDescriptor_md.c</in>
                 <in>FileOutputStream_md.c</in>
                 <in>ProcessEnvironment_md.c</in>
                 <in>ProcessHandleImpl_unix.c</in>
-                <in>ProcessHandleImpl_unix.h</in>
                 <in>ProcessImpl_md.c</in>
                 <in>TimeZone_md.c</in>
-                <in>TimeZone_md.h</in>
                 <in>UnixFileSystem_md.c</in>
                 <in>VM_md.c</in>
                 <in>canonicalize_md.c</in>
                 <in>childproc.c</in>
-                <in>childproc.h</in>
-                <in>gdefs_md.h</in>
                 <in>io_util_md.c</in>
-                <in>io_util_md.h</in>
                 <in>java_props_md.c</in>
                 <in>jdk_util_md.c</in>
-                <in>jdk_util_md.h</in>
-                <in>jlong_md.h</in>
                 <in>jni_util_md.c</in>
-                <in>locale_str.h</in>
               </df>
               <df name="libjimage">
                 <in>osSupport_unix.cpp</in>
               </df>
               <df name="libjli">
-                <in>java_md.h</in>
                 <in>java_md_common.c</in>
                 <in>java_md_solinux.c</in>
-                <in>java_md_solinux.h</in>
+              </df>
+              <df name="libjsig">
+                <in>jsig.c</in>
               </df>
               <df name="libnet">
                 <in>DefaultProxySelector.c</in>
                 <in>Inet4AddressImpl.c</in>
                 <in>Inet6AddressImpl.c</in>

@@ -3307,11 +1382,10 @@
                 <in>SdpSupport.c</in>
                 <in>SocketImpl.c</in>
                 <in>SocketInputStream.c</in>
                 <in>SocketOutputStream.c</in>
                 <in>net_util_md.c</in>
-                <in>net_util_md.h</in>
                 <in>portconfig.c</in>
               </df>
               <df name="libnio">
                 <df name="ch">
                   <in>DatagramChannelImpl.c</in>

@@ -3321,351 +1395,49 @@
                   <in>FileKey.c</in>
                   <in>IOUtil.c</in>
                   <in>InheritedChannel.c</in>
                   <in>NativeThread.c</in>
                   <in>Net.c</in>
-                  <in>PollArrayWrapper.c</in>
+                  <in>PollSelectorImpl.c</in>
                   <in>ServerSocketChannelImpl.c</in>
                   <in>SocketChannelImpl.c</in>
                   <in>SocketDispatcher.c</in>
                   <in>UnixAsynchronousServerSocketChannelImpl.c</in>
                   <in>UnixAsynchronousSocketChannelImpl.c</in>
-                  <in>nio_util.h</in>
                 </df>
                 <df name="fs">
                   <in>UnixCopyFile.c</in>
                   <in>UnixNativeDispatcher.c</in>
                 </df>
                 <in>MappedByteBuffer.c</in>
               </df>
             </df>
           </df>
-          <df name="windows">
+        </df>
+        <df name="java.desktop">
+          <df name="linux">
             <df name="native">
-              <df name="include">
-                <in>jni_md.h</in>
-                <in>jvm_md.h</in>
+              <df name="libjsound">
+                <in>PLATFORM_API_LinuxOS_ALSA_CommonUtils.c</in>
+                <in>PLATFORM_API_LinuxOS_ALSA_MidiIn.c</in>
+                <in>PLATFORM_API_LinuxOS_ALSA_MidiOut.c</in>
+                <in>PLATFORM_API_LinuxOS_ALSA_MidiUtils.c</in>
+                <in>PLATFORM_API_LinuxOS_ALSA_PCM.c</in>
+                <in>PLATFORM_API_LinuxOS_ALSA_PCMUtils.c</in>
+                <in>PLATFORM_API_LinuxOS_ALSA_Ports.c</in>
               </df>
-              <df name="libjava">
-                <in>Console_md.c</in>
-                <in>FileDescriptor_md.c</in>
-                <in>FileOutputStream_md.c</in>
-                <in>HostLocaleProviderAdapter_md.c</in>
-                <in>ProcessEnvironment_md.c</in>
-                <in>ProcessHandleImpl_win.c</in>
-                <in>ProcessImpl_md.c</in>
-                <in>TimeZone_md.c</in>
-                <in>TimeZone_md.h</in>
-                <in>VM_md.c</in>
-                <in>Win32ErrorMode.c</in>
-                <in>WinCAPISeedGenerator.c</in>
-                <in>WinNTFileSystem_md.c</in>
-                <in>canonicalize_md.c</in>
-                <in>dirent_md.c</in>
-                <in>dirent_md.h</in>
-                <in>gdefs_md.h</in>
-                <in>io_util_md.c</in>
-                <in>io_util_md.h</in>
-                <in>java_main_md.h</in>
-                <in>java_props_md.c</in>
-                <in>jdk_util_md.c</in>
-                <in>jdk_util_md.h</in>
-                <in>jlong_md.h</in>
-                <in>jni_util_md.c</in>
-                <in>locale_str.h</in>
               </df>
-              <df name="libjimage">
-                <in>osSupport_windows.cpp</in>
               </df>
-              <df name="libjli">
-                <in>cmdtoargs.c</in>
-                <in>java_md.c</in>
-                <in>java_md.h</in>
-              </df>
-              <df name="libnet">
-                <in>DefaultProxySelector.c</in>
-                <in>DualStackPlainDatagramSocketImpl.c</in>
-                <in>DualStackPlainSocketImpl.c</in>
-                <in>Inet4AddressImpl.c</in>
-                <in>Inet6AddressImpl.c</in>
-                <in>InetAddressImplFactory.c</in>
-                <in>NTLMAuthSequence.c</in>
-                <in>NetworkInterface.c</in>
-                <in>NetworkInterface.h</in>
-                <in>NetworkInterface_winXP.c</in>
-                <in>ResolverConfigurationImpl.c</in>
-                <in>SocketImpl.c</in>
-                <in>SocketInputStream.c</in>
-                <in>SocketOutputStream.c</in>
-                <in>TwoStacksPlainDatagramSocketImpl.c</in>
-                <in>TwoStacksPlainSocketImpl.c</in>
-                <in>net_util_md.c</in>
-                <in>net_util_md.h</in>
-                <in>portconfig.c</in>
-              </df>
-              <df name="libnio">
-                <df name="ch">
-                  <in>DatagramChannelImpl.c</in>
-                  <in>DatagramDispatcher.c</in>
-                  <in>FileChannelImpl.c</in>
-                  <in>FileDispatcherImpl.c</in>
-                  <in>FileKey.c</in>
-                  <in>IOUtil.c</in>
-                  <in>Iocp.c</in>
-                  <in>Net.c</in>
-                  <in>ServerSocketChannelImpl.c</in>
-                  <in>SocketChannelImpl.c</in>
-                  <in>SocketDispatcher.c</in>
-                  <in>WindowsAsynchronousFileChannelImpl.c</in>
-                  <in>WindowsAsynchronousServerSocketChannelImpl.c</in>
-                  <in>WindowsAsynchronousSocketChannelImpl.c</in>
-                  <in>WindowsSelectorImpl.c</in>
-                  <in>nio_util.h</in>
-                </df>
-                <df name="fs">
-                  <in>RegistryFileTypeDetector.c</in>
-                  <in>WindowsNativeDispatcher.c</in>
-                </df>
-                <in>MappedByteBuffer.c</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="java.corba">
-          <df name="share">
-            <df name="classes">
-              <df name="com">
-                <df name="sun">
-                  <df name="corba">
-                    <df name="se">
-                      <df name="impl">
-                        <df name="corba">
-                          <in>orb_config_design.txt</in>
-                        </df>
-                        <df name="oa">
-                          <df name="poa">
-                            <in>minor_code_example.txt</in>
-                            <in>standard_minor_codes.txt</in>
-                          </df>
-                        </df>
-                        <df name="orb">
-                          <in>parsing_combinators.txt</in>
-                        </df>
-                      </df>
-                      <df name="spi">
-                        <df name="legacy">
-                          <df name="connection">
-                            <in>README.txt</in>
-                          </df>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="java.desktop">
-          <df name="aix">
-            <df name="native">
-              <df name="libawt">
-                <in>porting_aix.c</in>
-                <in>porting_aix.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="macosx">
-            <df name="native">
-              <df name="include">
-                <in>jawt_md.h</in>
-              </df>
-              <df name="libawt_lwawt">
-                <df name="awt">
-                  <in>AWTEvent.h</in>
-                  <in>AWTEvent.m</in>
-                  <in>AWTSurfaceLayers.h</in>
-                  <in>AWTSurfaceLayers.m</in>
-                  <in>AWTView.h</in>
-                  <in>AWTView.m</in>
-                  <in>AWTWindow.h</in>
-                  <in>AWTWindow.m</in>
-                  <in>ApplicationDelegate.h</in>
-                  <in>ApplicationDelegate.m</in>
-                  <in>CClipboard.m</in>
-                  <in>CCursorManager.m</in>
-                  <in>CDataTransferer.h</in>
-                  <in>CDataTransferer.m</in>
-                  <in>CDesktopPeer.m</in>
-                  <in>CDragSource.h</in>
-                  <in>CDragSource.m</in>
-                  <in>CDragSourceContextPeer.m</in>
-                  <in>CDropTarget.h</in>
-                  <in>CDropTarget.m</in>
-                  <in>CDropTargetContextPeer.m</in>
-                  <in>CFRetainedResource.m</in>
-                  <in>CFileDialog.h</in>
-                  <in>CFileDialog.m</in>
-                  <in>CGraphicsConfig.m</in>
-                  <in>CGraphicsDevice.m</in>
-                  <in>CGraphicsEnv.m</in>
-                  <in>CImage.m</in>
-                  <in>CInputMethod.m</in>
-                  <in>CMenu.h</in>
-                  <in>CMenu.m</in>
-                  <in>CMenuBar.h</in>
-                  <in>CMenuBar.m</in>
-                  <in>CMenuComponent.h</in>
-                  <in>CMenuComponent.m</in>
-                  <in>CMenuItem.h</in>
-                  <in>CMenuItem.m</in>
-                  <in>CPopupMenu.h</in>
-                  <in>CPopupMenu.m</in>
-                  <in>CPrinterJob.m</in>
-                  <in>CRobot.m</in>
-                  <in>CRobotKeyCode.h</in>
-                  <in>CRobotKeyCode.m</in>
-                  <in>CSystemColors.h</in>
-                  <in>CSystemColors.m</in>
-                  <in>CTextPipe.m</in>
-                  <in>CTrayIcon.h</in>
-                  <in>CTrayIcon.m</in>
-                  <in>CWrapper.m</in>
-                  <in>DnDUtilities.h</in>
-                  <in>DnDUtilities.m</in>
-                  <in>GeomUtilities.h</in>
-                  <in>GeomUtilities.m</in>
-                  <in>ImageSurfaceData.h</in>
-                  <in>ImageSurfaceData.m</in>
-                  <in>InitIDs.h</in>
-                  <in>InitIDs.m</in>
-                  <in>JavaAccessibilityAction.h</in>
-                  <in>JavaAccessibilityAction.m</in>
-                  <in>JavaAccessibilityUtilities.h</in>
-                  <in>JavaAccessibilityUtilities.m</in>
-                  <in>JavaComponentAccessibility.h</in>
-                  <in>JavaComponentAccessibility.m</in>
-                  <in>JavaTextAccessibility.h</in>
-                  <in>JavaTextAccessibility.m</in>
-                  <in>LWCToolkit.h</in>
-                  <in>LWCToolkit.m</in>
-                  <in>OSVersion.h</in>
-                  <in>OSVersion.m</in>
-                  <in>PrintModel.h</in>
-                  <in>PrintModel.m</in>
-                  <in>PrinterSurfaceData.h</in>
-                  <in>PrinterSurfaceData.m</in>
-                  <in>PrinterView.h</in>
-                  <in>PrinterView.m</in>
-                  <in>QuartzRenderer.m</in>
-                  <in>QuartzSurfaceData.h</in>
-                  <in>QuartzSurfaceData.m</in>
-                  <in>awt_DrawingSurface.m</in>
-                </df>
-                <df name="font">
-                  <in>AWTFont.h</in>
-                  <in>AWTFont.m</in>
-                  <in>AWTStrike.h</in>
-                  <in>AWTStrike.m</in>
-                  <in>CCharToGlyphMapper.m</in>
-                  <in>CGGlyphImages.h</in>
-                  <in>CGGlyphImages.m</in>
-                  <in>CGGlyphOutlines.h</in>
-                  <in>CGGlyphOutlines.m</in>
-                  <in>CoreTextSupport.h</in>
-                  <in>CoreTextSupport.m</in>
-                </df>
-                <df name="java2d">
-                  <df name="opengl">
-                    <df name="J2D_GL">
-                      <in>cglext.h</in>
-                    </df>
-                    <in>CGLGraphicsConfig.h</in>
-                    <in>CGLGraphicsConfig.m</in>
-                    <in>CGLLayer.h</in>
-                    <in>CGLLayer.m</in>
-                    <in>CGLSurfaceData.h</in>
-                    <in>CGLSurfaceData.m</in>
-                    <in>OGLFuncs_md.h</in>
-                  </df>
-                </df>
-              </df>
-              <df name="libjawt">
-                <in>jawt.m</in>
-              </df>
-              <df name="libjsound">
-                <in>PLATFORM_API_MacOSX_MidiIn.c</in>
-                <in>PLATFORM_API_MacOSX_MidiOut.c</in>
-                <in>PLATFORM_API_MacOSX_MidiUtils.c</in>
-                <in>PLATFORM_API_MacOSX_MidiUtils.h</in>
-                <in>PLATFORM_API_MacOSX_PCM.cpp</in>
-                <in>PLATFORM_API_MacOSX_Ports.cpp</in>
-                <in>PLATFORM_API_MacOSX_Utils.cpp</in>
-                <in>PLATFORM_API_MacOSX_Utils.h</in>
-              </df>
-              <df name="libosx">
-                <in>CFileManager.m</in>
-              </df>
-              <df name="libosxapp">
-                <in>AWT_debug.h</in>
-                <in>AWT_debug.m</in>
-                <in>NSApplicationAWT.h</in>
-                <in>NSApplicationAWT.m</in>
-                <in>PropertiesUtilities.h</in>
-                <in>PropertiesUtilities.m</in>
-                <in>QueuingApplicationDelegate.h</in>
-                <in>QueuingApplicationDelegate.m</in>
-                <in>ThreadUtilities.h</in>
-                <in>ThreadUtilities.m</in>
-              </df>
-              <df name="libosxui">
-                <in>AquaFileView.m</in>
-                <in>AquaLookAndFeel.m</in>
-                <in>AquaNativeResources.m</in>
-                <in>JRSUIConstantSync.h</in>
-                <in>JRSUIConstantSync.m</in>
-                <in>JRSUIController.m</in>
-                <in>JRSUIFocus.m</in>
-                <in>ScreenMenu.h</in>
-                <in>ScreenMenu.m</in>
-              </df>
-              <df name="libsplashscreen">
-                <in>splashscreen_config.h</in>
-                <in>splashscreen_sys.m</in>
-              </df>
-            </df>
-          </df>
-          <df name="share">
-            <df name="classes">
-              <df name="javax">
-                <df name="swing">
-                  <df name="text">
-                    <df name="rtf">
-                      <df name="charsets">
-                        <in>NeXT.txt</in>
-                        <in>ansi.txt</in>
-                        <in>cpg437.txt</in>
-                        <in>cpg850.txt</in>
-                        <in>mac.txt</in>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="native">
-              <df name="common">
-                <df name="awt">
-                  <df name="debug">
-                    <in>debug_assert.c</in>
-                    <in>debug_assert.h</in>
-                    <in>debug_mem.c</in>
-                    <in>debug_mem.h</in>
-                    <in>debug_trace.c</in>
-                    <in>debug_trace.h</in>
-                    <in>debug_util.c</in>
-                    <in>debug_util.h</in>
+          <df name="share">
+            <df name="native">
+              <df name="common">
+                <df name="awt">
+                  <df name="debug">
+                    <in>debug_assert.c</in>
+                    <in>debug_mem.c</in>
+                    <in>debug_trace.c</in>
+                    <in>debug_util.c</in>
                   </df>
                   <df name="medialib">
                     <in>mlib_ImageCopy_Bit.c</in>
                     <in>mlib_ImageCreate.c</in>
                     <in>mlib_sys.c</in>

@@ -3674,609 +1446,220 @@
                     <in>rect.c</in>
                   </df>
                 </df>
                 <df name="font">
                   <in>AccelGlyphCache.c</in>
-                  <in>AccelGlyphCache.h</in>
-                  <in>fontscalerdefs.h</in>
-                  <in>sunfontids.h</in>
                 </df>
                 <df name="java2d">
                   <df name="opengl">
-                    <df name="J2D_GL">
-                      <in>gl.h</in>
-                      <in>glext.h</in>
-                    </df>
                     <in>OGLBlitLoops.c</in>
-                    <in>OGLBlitLoops.h</in>
                     <in>OGLBufImgOps.c</in>
-                    <in>OGLBufImgOps.h</in>
                     <in>OGLContext.c</in>
-                    <in>OGLContext.h</in>
-                    <in>OGLFuncMacros.h</in>
                     <in>OGLFuncs.c</in>
-                    <in>OGLFuncs.h</in>
                     <in>OGLMaskBlit.c</in>
-                    <in>OGLMaskBlit.h</in>
                     <in>OGLMaskFill.c</in>
-                    <in>OGLMaskFill.h</in>
                     <in>OGLPaints.c</in>
-                    <in>OGLPaints.h</in>
                     <in>OGLRenderQueue.c</in>
-                    <in>OGLRenderQueue.h</in>
                     <in>OGLRenderer.c</in>
-                    <in>OGLRenderer.h</in>
                     <in>OGLSurfaceData.c</in>
-                    <in>OGLSurfaceData.h</in>
                     <in>OGLTextRenderer.c</in>
-                    <in>OGLTextRenderer.h</in>
                     <in>OGLVertexCache.c</in>
-                    <in>OGLVertexCache.h</in>
                   </df>
                 </df>
               </df>
-              <df name="include">
-                <in>jawt.h</in>
-              </df>
               <df name="libawt">
                 <df name="awt">
                   <df name="image">
                     <df name="cvutils">
-                      <in>img_alpha.h</in>
-                      <in>img_anycm.h</in>
                       <in>img_colors.c</in>
-                      <in>img_colors.h</in>
-                      <in>img_dcm.h</in>
-                      <in>img_dcm8.h</in>
-                      <in>img_dir8dither.h</in>
-                      <in>img_dirdither.h</in>
-                      <in>img_fscolor.h</in>
-                      <in>img_fsdither.h</in>
-                      <in>img_fsgray.h</in>
-                      <in>img_fsutil.h</in>
                       <in>img_globals.c</in>
-                      <in>img_globals.h</in>
-                      <in>img_icm.h</in>
-                      <in>img_input32.h</in>
-                      <in>img_input8.h</in>
-                      <in>img_input8_32.h</in>
-                      <in>img_nodither.h</in>
-                      <in>img_noscale.h</in>
-                      <in>img_opaque.h</in>
-                      <in>img_ordclrsgn.h</in>
-                      <in>img_ordclruns.h</in>
-                      <in>img_orddither.h</in>
-                      <in>img_ordgray.h</in>
-                      <in>img_output16.h</in>
-                      <in>img_output16_32.h</in>
-                      <in>img_output24.h</in>
-                      <in>img_output32.h</in>
-                      <in>img_output8.h</in>
-                      <in>img_output8_16_24.h</in>
-                      <in>img_output8_16_32.h</in>
-                      <in>img_output8_32.h</in>
-                      <in>img_replscale.h</in>
-                      <in>img_scaleloop.h</in>
-                      <in>img_util.h</in>
                     </df>
                     <df name="gif">
                       <in>gifdecoder.c</in>
                     </df>
                     <in>BufImgSurfaceData.c</in>
-                    <in>BufImgSurfaceData.h</in>
                     <in>DataBufferNative.c</in>
                     <in>awt_ImageRep.c</in>
                     <in>awt_parseImage.c</in>
-                    <in>awt_parseImage.h</in>
                     <in>dither.c</in>
-                    <in>dither.h</in>
                     <in>imageInitIDs.c</in>
-                    <in>imageInitIDs.h</in>
                   </df>
                   <df name="medialib">
                     <in>awt_ImagingLib.c</in>
-                    <in>awt_ImagingLib.h</in>
                   </df>
                 </df>
                 <df name="java2d">
                   <df name="loops">
                     <in>AlphaMacros.c</in>
-                    <in>AlphaMacros.h</in>
                     <in>AlphaMath.c</in>
-                    <in>AlphaMath.h</in>
                     <in>Any3Byte.c</in>
-                    <in>Any3Byte.h</in>
                     <in>Any4Byte.c</in>
-                    <in>Any4Byte.h</in>
                     <in>AnyByte.c</in>
-                    <in>AnyByte.h</in>
-                    <in>AnyByteBinary.h</in>
                     <in>AnyInt.c</in>
-                    <in>AnyInt.h</in>
                     <in>AnyShort.c</in>
-                    <in>AnyShort.h</in>
                     <in>Blit.c</in>
                     <in>BlitBg.c</in>
                     <in>ByteBinary1Bit.c</in>
-                    <in>ByteBinary1Bit.h</in>
                     <in>ByteBinary2Bit.c</in>
-                    <in>ByteBinary2Bit.h</in>
                     <in>ByteBinary4Bit.c</in>
-                    <in>ByteBinary4Bit.h</in>
                     <in>ByteGray.c</in>
-                    <in>ByteGray.h</in>
                     <in>ByteIndexed.c</in>
-                    <in>ByteIndexed.h</in>
                     <in>DrawLine.c</in>
                     <in>DrawParallelogram.c</in>
                     <in>DrawPath.c</in>
-                    <in>DrawPath.h</in>
                     <in>DrawPolygons.c</in>
                     <in>DrawRect.c</in>
                     <in>FillParallelogram.c</in>
                     <in>FillPath.c</in>
                     <in>FillRect.c</in>
                     <in>FillSpans.c</in>
                     <in>FourByteAbgr.c</in>
-                    <in>FourByteAbgr.h</in>
                     <in>FourByteAbgrPre.c</in>
-                    <in>FourByteAbgrPre.h</in>
-                    <in>GlyphImageRef.h</in>
                     <in>GraphicsPrimitiveMgr.c</in>
-                    <in>GraphicsPrimitiveMgr.h</in>
-                    <in>ImageData.h</in>
                     <in>Index12Gray.c</in>
-                    <in>Index12Gray.h</in>
                     <in>Index8Gray.c</in>
-                    <in>Index8Gray.h</in>
                     <in>IntArgb.c</in>
-                    <in>IntArgb.h</in>
                     <in>IntArgbBm.c</in>
-                    <in>IntArgbBm.h</in>
                     <in>IntArgbPre.c</in>
-                    <in>IntArgbPre.h</in>
                     <in>IntBgr.c</in>
-                    <in>IntBgr.h</in>
-                    <in>IntDcm.h</in>
                     <in>IntRgb.c</in>
-                    <in>IntRgb.h</in>
                     <in>IntRgbx.c</in>
-                    <in>IntRgbx.h</in>
-                    <in>LineUtils.h</in>
-                    <in>LoopMacros.h</in>
                     <in>MapAccelFunc.c</in>
                     <in>MaskBlit.c</in>
                     <in>MaskFill.c</in>
-                    <in>ParallelogramUtils.h</in>
                     <in>ProcessPath.c</in>
-                    <in>ProcessPath.h</in>
                     <in>ScaledBlit.c</in>
                     <in>ThreeByteBgr.c</in>
-                    <in>ThreeByteBgr.h</in>
                     <in>TransformHelper.c</in>
                     <in>Ushort4444Argb.c</in>
-                    <in>Ushort4444Argb.h</in>
                     <in>Ushort555Rgb.c</in>
-                    <in>Ushort555Rgb.h</in>
                     <in>Ushort555Rgbx.c</in>
-                    <in>Ushort555Rgbx.h</in>
                     <in>Ushort565Rgb.c</in>
-                    <in>Ushort565Rgb.h</in>
                     <in>UshortGray.c</in>
-                    <in>UshortGray.h</in>
                     <in>UshortIndexed.c</in>
-                    <in>UshortIndexed.h</in>
                   </df>
                   <df name="pipe">
                     <in>BufferedMaskBlit.c</in>
                     <in>BufferedRenderPipe.c</in>
-                    <in>PathConsumer2D.h</in>
                     <in>Region.c</in>
-                    <in>Region.h</in>
                     <in>ShapeSpanIterator.c</in>
                     <in>SpanClipRenderer.c</in>
-                    <in>SpanIterator.h</in>
                   </df>
                   <in>Disposer.c</in>
-                  <in>Disposer.h</in>
                   <in>SurfaceData.c</in>
-                  <in>SurfaceData.h</in>
                   <in>Trace.c</in>
-                  <in>Trace.h</in>
                 </df>
               </df>
               <df name="libfontmanager">
                 <df name="harfbuzz">
                   <df name="hb-ucdn">
                     <in>ucdn.c</in>
-                    <in>ucdn.h</in>
-                    <in>unicodedata_db.h</in>
                   </df>
-                  <in>hb-atomic-private.hh</in>
                   <in>hb-blob.cc</in>
-                  <in>hb-blob.h</in>
-                  <in>hb-buffer-deserialize-json.hh</in>
-                  <in>hb-buffer-deserialize-text.hh</in>
-                  <in>hb-buffer-private.hh</in>
                   <in>hb-buffer-serialize.cc</in>
                   <in>hb-buffer.cc</in>
-                  <in>hb-buffer.h</in>
-                  <in>hb-cache-private.hh</in>
                   <in>hb-common.cc</in>
-                  <in>hb-common.h</in>
-                  <in>hb-coretext.cc</in>
-                  <in>hb-coretext.h</in>
-                  <in>hb-deprecated.h</in>
-                  <in>hb-face-private.hh</in>
                   <in>hb-face.cc</in>
-                  <in>hb-face.h</in>
                   <in>hb-fallback-shape.cc</in>
-                  <in>hb-font-private.hh</in>
                   <in>hb-font.cc</in>
-                  <in>hb-font.h</in>
-                  <in>hb-ft.cc</in>
-                  <in>hb-ft.h</in>
-                  <in>hb-mutex-private.hh</in>
-                  <in>hb-object-private.hh</in>
-                  <in>hb-open-file-private.hh</in>
-                  <in>hb-open-type-private.hh</in>
-                  <in>hb-ot-cbdt-table.hh</in>
-                  <in>hb-ot-cmap-table.hh</in>
+                  <in>hb-map.cc</in>
                   <in>hb-ot-font.cc</in>
-                  <in>hb-ot-font.h</in>
-                  <in>hb-ot-glyf-table.hh</in>
-                  <in>hb-ot-head-table.hh</in>
-                  <in>hb-ot-hhea-table.hh</in>
-                  <in>hb-ot-hmtx-table.hh</in>
-                  <in>hb-ot-layout-common-private.hh</in>
-                  <in>hb-ot-layout-gdef-table.hh</in>
-                  <in>hb-ot-layout-gpos-table.hh</in>
-                  <in>hb-ot-layout-gsub-table.hh</in>
-                  <in>hb-ot-layout-gsubgpos-private.hh</in>
-                  <in>hb-ot-layout-jstf-table.hh</in>
-                  <in>hb-ot-layout-private.hh</in>
                   <in>hb-ot-layout.cc</in>
-                  <in>hb-ot-layout.h</in>
-                  <in>hb-ot-map-private.hh</in>
                   <in>hb-ot-map.cc</in>
-                  <in>hb-ot-math.h</in>
-                  <in>hb-ot-maxp-table.hh</in>
-                  <in>hb-ot-name-table.hh</in>
-                  <in>hb-ot-os2-table.hh</in>
-                  <in>hb-ot-shape-complex-arabic-fallback.hh</in>
-                  <in>hb-ot-shape-complex-arabic-private.hh</in>
-                  <in>hb-ot-shape-complex-arabic-table.hh</in>
-                  <in>hb-ot-shape-complex-arabic-win1256.hh</in>
                   <in>hb-ot-shape-complex-arabic.cc</in>
                   <in>hb-ot-shape-complex-default.cc</in>
                   <in>hb-ot-shape-complex-hangul.cc</in>
                   <in>hb-ot-shape-complex-hebrew.cc</in>
-                  <in>hb-ot-shape-complex-indic-machine.hh</in>
-                  <in>hb-ot-shape-complex-indic-private.hh</in>
                   <in>hb-ot-shape-complex-indic-table.cc</in>
                   <in>hb-ot-shape-complex-indic.cc</in>
-                  <in>hb-ot-shape-complex-myanmar-machine.hh</in>
+                  <in>hb-ot-shape-complex-khmer.cc</in>
                   <in>hb-ot-shape-complex-myanmar.cc</in>
-                  <in>hb-ot-shape-complex-private.hh</in>
                   <in>hb-ot-shape-complex-thai.cc</in>
                   <in>hb-ot-shape-complex-tibetan.cc</in>
-                  <in>hb-ot-shape-complex-use-machine.hh</in>
-                  <in>hb-ot-shape-complex-use-private.hh</in>
                   <in>hb-ot-shape-complex-use-table.cc</in>
                   <in>hb-ot-shape-complex-use.cc</in>
-                  <in>hb-ot-shape-fallback-private.hh</in>
                   <in>hb-ot-shape-fallback.cc</in>
-                  <in>hb-ot-shape-normalize-private.hh</in>
                   <in>hb-ot-shape-normalize.cc</in>
-                  <in>hb-ot-shape-private.hh</in>
                   <in>hb-ot-shape.cc</in>
-                  <in>hb-ot-shape.h</in>
                   <in>hb-ot-tag.cc</in>
-                  <in>hb-ot-tag.h</in>
-                  <in>hb-ot.h</in>
-                  <in>hb-private.hh</in>
-                  <in>hb-set-private.hh</in>
+                  <in>hb-ot-var.cc</in>
                   <in>hb-set.cc</in>
-                  <in>hb-set.h</in>
-                  <in>hb-shape-plan-private.hh</in>
                   <in>hb-shape-plan.cc</in>
-                  <in>hb-shape-plan.h</in>
                   <in>hb-shape.cc</in>
-                  <in>hb-shape.h</in>
-                  <in>hb-shaper-impl-private.hh</in>
-                  <in>hb-shaper-list.hh</in>
-                  <in>hb-shaper-private.hh</in>
                   <in>hb-shaper.cc</in>
+                  <in>hb-static.cc</in>
                   <in>hb-ucdn.cc</in>
-                  <in>hb-unicode-private.hh</in>
                   <in>hb-unicode.cc</in>
-                  <in>hb-unicode.h</in>
-                  <in>hb-utf-private.hh</in>
-                  <in>hb-version.h</in>
                   <in>hb-warning.cc</in>
-                  <in>hb.h</in>
-                </df>
-                <df name="layout">
-                  <in>AlternateSubstSubtables.cpp</in>
-                  <in>AlternateSubstSubtables.h</in>
-                  <in>AnchorTables.cpp</in>
-                  <in>AnchorTables.h</in>
-                  <in>ArabicLayoutEngine.cpp</in>
-                  <in>ArabicLayoutEngine.h</in>
-                  <in>ArabicShaping.cpp</in>
-                  <in>ArabicShaping.h</in>
-                  <in>AttachmentPosnSubtables.h</in>
-                  <in>CanonData.cpp</in>
-                  <in>CanonShaping.cpp</in>
-                  <in>CanonShaping.h</in>
-                  <in>CharSubstitutionFilter.h</in>
-                  <in>ClassDefinitionTables.cpp</in>
-                  <in>ClassDefinitionTables.h</in>
-                  <in>ContextualGlyphInsertion.h</in>
-                  <in>ContextualGlyphInsertionProc2.cpp</in>
-                  <in>ContextualGlyphInsertionProc2.h</in>
-                  <in>ContextualGlyphSubstProc.cpp</in>
-                  <in>ContextualGlyphSubstProc.h</in>
-                  <in>ContextualGlyphSubstProc2.cpp</in>
-                  <in>ContextualGlyphSubstProc2.h</in>
-                  <in>ContextualGlyphSubstitution.h</in>
-                  <in>ContextualSubstSubtables.cpp</in>
-                  <in>ContextualSubstSubtables.h</in>
-                  <in>CoverageTables.cpp</in>
-                  <in>CoverageTables.h</in>
-                  <in>CursiveAttachmentSubtables.cpp</in>
-                  <in>CursiveAttachmentSubtables.h</in>
-                  <in>DefaultCharMapper.h</in>
-                  <in>DeviceTables.cpp</in>
-                  <in>DeviceTables.h</in>
-                  <in>ExtensionSubtables.cpp</in>
-                  <in>ExtensionSubtables.h</in>
-                  <in>Features.cpp</in>
-                  <in>GDEFMarkFilter.cpp</in>
-                  <in>GDEFMarkFilter.h</in>
-                  <in>GXLayoutEngine.cpp</in>
-                  <in>GXLayoutEngine.h</in>
-                  <in>GXLayoutEngine2.cpp</in>
-                  <in>GXLayoutEngine2.h</in>
-                  <in>GlyphDefinitionTables.cpp</in>
-                  <in>GlyphDefinitionTables.h</in>
-                  <in>GlyphIterator.cpp</in>
-                  <in>GlyphIterator.h</in>
-                  <in>GlyphLookupTables.cpp</in>
-                  <in>GlyphLookupTables.h</in>
-                  <in>GlyphPositionAdjustments.cpp</in>
-                  <in>GlyphPositionAdjustments.h</in>
-                  <in>GlyphPositioningTables.cpp</in>
-                  <in>GlyphPositioningTables.h</in>
-                  <in>GlyphPosnLookupProc.cpp</in>
-                  <in>GlyphPosnLookupProc.h</in>
-                  <in>GlyphSubstLookupProc.cpp</in>
-                  <in>GlyphSubstLookupProc.h</in>
-                  <in>GlyphSubstitutionTables.cpp</in>
-                  <in>GlyphSubstitutionTables.h</in>
-                  <in>HanLayoutEngine.cpp</in>
-                  <in>HanLayoutEngine.h</in>
-                  <in>HangulLayoutEngine.cpp</in>
-                  <in>HangulLayoutEngine.h</in>
-                  <in>ICUFeatures.h</in>
-                  <in>IndicClassTables.cpp</in>
-                  <in>IndicLayoutEngine.cpp</in>
-                  <in>IndicLayoutEngine.h</in>
-                  <in>IndicRearrangement.h</in>
-                  <in>IndicRearrangementProcessor.cpp</in>
-                  <in>IndicRearrangementProcessor.h</in>
-                  <in>IndicRearrangementProcessor2.cpp</in>
-                  <in>IndicRearrangementProcessor2.h</in>
-                  <in>IndicReordering.cpp</in>
-                  <in>IndicReordering.h</in>
-                  <in>KernTable.cpp</in>
-                  <in>KernTable.h</in>
-                  <in>KhmerLayoutEngine.cpp</in>
-                  <in>KhmerLayoutEngine.h</in>
-                  <in>KhmerReordering.cpp</in>
-                  <in>KhmerReordering.h</in>
-                  <in>LEFontInstance.cpp</in>
-                  <in>LEFontInstance.h</in>
-                  <in>LEGlyphFilter.h</in>
-                  <in>LEGlyphStorage.cpp</in>
-                  <in>LEGlyphStorage.h</in>
-                  <in>LEInsertionList.cpp</in>
-                  <in>LEInsertionList.h</in>
-                  <in>LELanguages.h</in>
-                  <in>LEScripts.h</in>
-                  <in>LEStandalone.h</in>
-                  <in>LESwaps.h</in>
-                  <in>LETableReference.h</in>
-                  <in>LETypes.h</in>
-                  <in>LayoutEngine.cpp</in>
-                  <in>LayoutEngine.h</in>
-                  <in>LayoutTables.h</in>
-                  <in>LigatureSubstProc.cpp</in>
-                  <in>LigatureSubstProc.h</in>
-                  <in>LigatureSubstProc2.cpp</in>
-                  <in>LigatureSubstProc2.h</in>
-                  <in>LigatureSubstSubtables.cpp</in>
-                  <in>LigatureSubstSubtables.h</in>
-                  <in>LigatureSubstitution.h</in>
-                  <in>LookupProcessor.cpp</in>
-                  <in>LookupProcessor.h</in>
-                  <in>LookupTables.cpp</in>
-                  <in>LookupTables.h</in>
-                  <in>Lookups.cpp</in>
-                  <in>Lookups.h</in>
-                  <in>MPreFixups.cpp</in>
-                  <in>MPreFixups.h</in>
-                  <in>MarkArrays.cpp</in>
-                  <in>MarkArrays.h</in>
-                  <in>MarkToBasePosnSubtables.cpp</in>
-                  <in>MarkToBasePosnSubtables.h</in>
-                  <in>MarkToLigaturePosnSubtables.cpp</in>
-                  <in>MarkToLigaturePosnSubtables.h</in>
-                  <in>MarkToMarkPosnSubtables.cpp</in>
-                  <in>MarkToMarkPosnSubtables.h</in>
-                  <in>MirroredCharData.cpp</in>
-                  <in>MorphStateTables.h</in>
-                  <in>MorphTables.cpp</in>
-                  <in>MorphTables.h</in>
-                  <in>MorphTables2.cpp</in>
-                  <in>MultipleSubstSubtables.cpp</in>
-                  <in>MultipleSubstSubtables.h</in>
-                  <in>NonContextualGlyphSubst.h</in>
-                  <in>NonContextualGlyphSubstProc.cpp</in>
-                  <in>NonContextualGlyphSubstProc.h</in>
-                  <in>NonContextualGlyphSubstProc2.cpp</in>
-                  <in>NonContextualGlyphSubstProc2.h</in>
-                  <in>OpenTypeLayoutEngine.cpp</in>
-                  <in>OpenTypeLayoutEngine.h</in>
-                  <in>OpenTypeTables.h</in>
-                  <in>OpenTypeUtilities.cpp</in>
-                  <in>OpenTypeUtilities.h</in>
-                  <in>PairPositioningSubtables.cpp</in>
-                  <in>PairPositioningSubtables.h</in>
-                  <in>ScriptAndLanguage.cpp</in>
-                  <in>ScriptAndLanguage.h</in>
-                  <in>ScriptAndLanguageTags.cpp</in>
-                  <in>ScriptAndLanguageTags.h</in>
-                  <in>SegmentArrayProcessor.cpp</in>
-                  <in>SegmentArrayProcessor.h</in>
-                  <in>SegmentArrayProcessor2.cpp</in>
-                  <in>SegmentArrayProcessor2.h</in>
-                  <in>SegmentSingleProcessor.cpp</in>
-                  <in>SegmentSingleProcessor.h</in>
-                  <in>SegmentSingleProcessor2.cpp</in>
-                  <in>SegmentSingleProcessor2.h</in>
-                  <in>ShapingTypeData.cpp</in>
-                  <in>SimpleArrayProcessor.cpp</in>
-                  <in>SimpleArrayProcessor.h</in>
-                  <in>SimpleArrayProcessor2.cpp</in>
-                  <in>SimpleArrayProcessor2.h</in>
-                  <in>SinglePositioningSubtables.cpp</in>
-                  <in>SinglePositioningSubtables.h</in>
-                  <in>SingleSubstitutionSubtables.cpp</in>
-                  <in>SingleSubstitutionSubtables.h</in>
-                  <in>SingleTableProcessor.cpp</in>
-                  <in>SingleTableProcessor.h</in>
-                  <in>SingleTableProcessor2.cpp</in>
-                  <in>SingleTableProcessor2.h</in>
-                  <in>StateTableProcessor.cpp</in>
-                  <in>StateTableProcessor.h</in>
-                  <in>StateTableProcessor2.cpp</in>
-                  <in>StateTableProcessor2.h</in>
-                  <in>StateTables.h</in>
-                  <in>SubstitutionLookups.cpp</in>
-                  <in>SubstitutionLookups.h</in>
-                  <in>SubtableProcessor.cpp</in>
-                  <in>SubtableProcessor.h</in>
-                  <in>SubtableProcessor2.cpp</in>
-                  <in>SubtableProcessor2.h</in>
-                  <in>SunLayoutEngine.cpp</in>
-                  <in>ThaiLayoutEngine.cpp</in>
-                  <in>ThaiLayoutEngine.h</in>
-                  <in>ThaiShaping.cpp</in>
-                  <in>ThaiShaping.h</in>
-                  <in>ThaiStateTables.cpp</in>
-                  <in>TibetanLayoutEngine.cpp</in>
-                  <in>TibetanLayoutEngine.h</in>
-                  <in>TibetanReordering.cpp</in>
-                  <in>TibetanReordering.h</in>
-                  <in>TrimmedArrayProcessor.cpp</in>
-                  <in>TrimmedArrayProcessor.h</in>
-                  <in>TrimmedArrayProcessor2.cpp</in>
-                  <in>TrimmedArrayProcessor2.h</in>
-                  <in>ValueRecords.cpp</in>
-                  <in>ValueRecords.h</in>
                 </df>
                 <in>DrawGlyphList.c</in>
-                <in>FontInstanceAdapter.cpp</in>
-                <in>FontInstanceAdapter.h</in>
                 <in>HBShaper.c</in>
-                <in>fontscaler.h</in>
                 <in>freetypeScaler.c</in>
-                <in>glyphblitting.h</in>
                 <in>hb-jdk-font.cc</in>
-                <in>hb-jdk.h</in>
                 <in>scriptMapping.c</in>
-                <in>scriptMapping.h</in>
                 <in>sunFont.c</in>
               </df>
               <df name="libjavajpeg">
                 <in>imageioJPEG.c</in>
                 <in>jcapimin.c</in>
                 <in>jcapistd.c</in>
                 <in>jccoefct.c</in>
                 <in>jccolor.c</in>
                 <in>jcdctmgr.c</in>
                 <in>jchuff.c</in>
-                <in>jchuff.h</in>
                 <in>jcinit.c</in>
                 <in>jcmainct.c</in>
                 <in>jcmarker.c</in>
                 <in>jcmaster.c</in>
                 <in>jcomapi.c</in>
-                <in>jconfig.h</in>
                 <in>jcparam.c</in>
                 <in>jcphuff.c</in>
                 <in>jcprepct.c</in>
                 <in>jcsample.c</in>
                 <in>jctrans.c</in>
                 <in>jdapimin.c</in>
                 <in>jdapistd.c</in>
                 <in>jdcoefct.c</in>
                 <in>jdcolor.c</in>
-                <in>jdct.h</in>
                 <in>jddctmgr.c</in>
                 <in>jdhuff.c</in>
-                <in>jdhuff.h</in>
                 <in>jdinput.c</in>
                 <in>jdmainct.c</in>
                 <in>jdmarker.c</in>
                 <in>jdmaster.c</in>
                 <in>jdmerge.c</in>
                 <in>jdphuff.c</in>
                 <in>jdpostct.c</in>
                 <in>jdsample.c</in>
                 <in>jdtrans.c</in>
                 <in>jerror.c</in>
-                <in>jerror.h</in>
                 <in>jfdctflt.c</in>
                 <in>jfdctfst.c</in>
                 <in>jfdctint.c</in>
                 <in>jidctflt.c</in>
                 <in>jidctfst.c</in>
                 <in>jidctint.c</in>
                 <in>jidctred.c</in>
-                <in>jinclude.h</in>
                 <in>jmemmgr.c</in>
                 <in>jmemnobs.c</in>
-                <in>jmemsys.h</in>
-                <in>jmorecfg.h</in>
                 <in>jpegdecoder.c</in>
-                <in>jpegint.h</in>
-                <in>jpeglib.h</in>
                 <in>jquant1.c</in>
                 <in>jquant2.c</in>
                 <in>jutils.c</in>
-                <in>jversion.h</in>
               </df>
               <df name="libjsound">
-                <in>Configure.h</in>
-                <in>DirectAudio.h</in>
                 <in>DirectAudioDevice.c</in>
                 <in>DirectAudioDeviceProvider.c</in>
                 <in>MidiInDevice.c</in>
                 <in>MidiInDeviceProvider.c</in>
                 <in>MidiOutDevice.c</in>
                 <in>MidiOutDeviceProvider.c</in>
                 <in>Platform.c</in>
                 <in>PlatformMidi.c</in>
-                <in>PlatformMidi.h</in>
                 <in>PortMixer.c</in>
                 <in>PortMixerProvider.c</in>
-                <in>Ports.h</in>
-                <in>SoundDefs.h</in>
                 <in>Utilities.c</in>
-                <in>Utilities.h</in>
               </df>
               <df name="liblcms">
                 <in>LCMS.c</in>
                 <in>cmsalpha.c</in>
                 <in>cmscam02.c</in>

@@ -4302,36 +1685,26 @@
                 <in>cmssm.c</in>
                 <in>cmstypes.c</in>
                 <in>cmsvirt.c</in>
                 <in>cmswtpnt.c</in>
                 <in>cmsxform.c</in>
-                <in>lcms2.h</in>
-                <in>lcms2_internal.h</in>
-                <in>lcms2_plugin.h</in>
               </df>
               <df name="libmlib_image">
-                <in>j2d_names.h</in>
-                <in>mlib.h</in>
                 <in>mlib_ImageAffine.c</in>
-                <in>mlib_ImageAffine.h</in>
                 <in>mlib_ImageAffineEdge.c</in>
                 <in>mlib_ImageAffine_BC_D64.c</in>
                 <in>mlib_ImageAffine_BC_F32.c</in>
                 <in>mlib_ImageAffine_BC_S32.c</in>
                 <in>mlib_ImageAffine_BL_D64.c</in>
                 <in>mlib_ImageAffine_BL_F32.c</in>
                 <in>mlib_ImageAffine_BL_S32.c</in>
                 <in>mlib_ImageAffine_NN.c</in>
                 <in>mlib_ImageAffine_NN_Bit.c</in>
-                <in>mlib_ImageCheck.h</in>
                 <in>mlib_ImageClipping.c</in>
-                <in>mlib_ImageClipping.h</in>
-                <in>mlib_ImageConv.h</in>
                 <in>mlib_ImageConvClearEdge_Bit.c</in>
                 <in>mlib_ImageConvClearEdge_Fp.c</in>
                 <in>mlib_ImageConvCopyEdge_Bit.c</in>
-                <in>mlib_ImageConvEdge.h</in>
                 <in>mlib_ImageConvKernelConvert.c</in>
                 <in>mlib_ImageConvMxN.c</in>
                 <in>mlib_ImageConvMxN_Fp.c</in>
                 <in>mlib_ImageConvMxN_ext.c</in>
                 <in>mlib_ImageConv_16ext.c</in>

@@ -4341,263 +1714,118 @@
                 <in>mlib_ImageConv_8nw.c</in>
                 <in>mlib_ImageConv_D64nw.c</in>
                 <in>mlib_ImageConv_F32nw.c</in>
                 <in>mlib_ImageConv_u16ext.c</in>
                 <in>mlib_ImageConv_u16nw.c</in>
-                <in>mlib_ImageCopy.h</in>
-                <in>mlib_ImageCreate.h</in>
                 <in>mlib_ImageDivTables.c</in>
-                <in>mlib_ImageDivTables.h</in>
                 <in>mlib_ImageFilters.c</in>
-                <in>mlib_ImageFilters.h</in>
-                <in>mlib_ImageLookUp.h</in>
                 <in>mlib_ImageLookUp_64.c</in>
                 <in>mlib_ImageLookUp_Bit.c</in>
-                <in>mlib_ImageRowTable.h</in>
                 <in>mlib_ImageScanPoly.c</in>
                 <in>mlib_ImageUtils.c</in>
-                <in>mlib_SysMath.h</in>
                 <in>mlib_c_ImageAffine_BC.c</in>
                 <in>mlib_c_ImageAffine_BC_S16.c</in>
                 <in>mlib_c_ImageAffine_BC_U16.c</in>
                 <in>mlib_c_ImageAffine_BL.c</in>
                 <in>mlib_c_ImageAffine_BL_S16.c</in>
                 <in>mlib_c_ImageAffine_BL_U16.c</in>
                 <in>mlib_c_ImageAffine_NN.c</in>
-                <in>mlib_c_ImageConv.h</in>
                 <in>mlib_c_ImageConvClearEdge.c</in>
                 <in>mlib_c_ImageConvCopyEdge.c</in>
                 <in>mlib_c_ImageConvVersion.c</in>
                 <in>mlib_c_ImageConv_f.c</in>
                 <in>mlib_c_ImageCopy.c</in>
                 <in>mlib_c_ImageLookUp.c</in>
-                <in>mlib_c_ImageLookUp.h</in>
                 <in>mlib_c_ImageLookUp_f.c</in>
-                <in>mlib_image.h</in>
-                <in>mlib_image_get.h</in>
-                <in>mlib_image_proto.h</in>
-                <in>mlib_image_types.h</in>
-                <in>mlib_status.h</in>
-                <in>mlib_sys.h</in>
-                <in>mlib_sys_proto.h</in>
-                <in>mlib_types.h</in>
-                <in>safe_alloc.h</in>
-                <in>safe_math.h</in>
               </df>
               <df name="libsplashscreen">
                 <df name="giflib">
                   <in>dgif_lib.c</in>
                   <in>gif_err.c</in>
-                  <in>gif_hash.h</in>
-                  <in>gif_lib.h</in>
-                  <in>gif_lib_private.h</in>
                   <in>gifalloc.c</in>
                   <in>openbsd-reallocarray.c</in>
                 </df>
                 <df name="libpng">
                   <in>png.c</in>
-                  <in>png.h</in>
-                  <in>pngconf.h</in>
-                  <in>pngdebug.h</in>
                   <in>pngerror.c</in>
                   <in>pngget.c</in>
-                  <in>pnginfo.h</in>
-                  <in>pnglibconf.h</in>
                   <in>pngmem.c</in>
                   <in>pngpread.c</in>
-                  <in>pngpriv.h</in>
                   <in>pngread.c</in>
                   <in>pngrio.c</in>
                   <in>pngrtran.c</in>
                   <in>pngrutil.c</in>
                   <in>pngset.c</in>
-                  <in>pngstruct.h</in>
                   <in>pngtrans.c</in>
                 </df>
                 <in>java_awt_SplashScreen.c</in>
-                <in>splashscreen_gfx.h</in>
                 <in>splashscreen_gfx_impl.c</in>
-                <in>splashscreen_gfx_impl.h</in>
                 <in>splashscreen_gif.c</in>
                 <in>splashscreen_impl.c</in>
-                <in>splashscreen_impl.h</in>
                 <in>splashscreen_jpeg.c</in>
                 <in>splashscreen_png.c</in>
               </df>
             </df>
           </df>
           <df name="unix">
-            <df name="classes">
-              <df name="sun">
-                <df name="awt">
-                  <df name="X11">
-                    <df name="doc-files">
-                      <in>Modality.txt</in>
-                    </df>
-                    <in>keysym2ucs.h</in>
-                  </df>
-                </df>
-              </df>
-            </df>
             <df name="native">
               <df name="common">
                 <df name="awt">
-                  <df name="medialib">
-                    <in>mlib_v_ImageCopy_f.c</in>
-                    <in>mlib_v_ImageCopy_f.h</in>
-                    <in>vis_proto.h</in>
-                  </df>
                   <df name="systemscale">
                     <in>systemScale.c</in>
-                    <in>systemScale.h</in>
-                  </df>
-                  <df name="utility">
-                    <in>rect.h</in>
                   </df>
                   <in>CUPSfuncs.c</in>
                   <in>X11Color.c</in>
-                  <in>awt.h</in>
-                  <in>awt_Component.h</in>
-                  <in>awt_DrawingSurface.h</in>
                   <in>awt_Font.c</in>
-                  <in>awt_Font.h</in>
-                  <in>awt_GraphicsEnv.h</in>
-                  <in>awt_Mlib.h</in>
-                  <in>awt_p.h</in>
-                  <in>awt_util.h</in>
-                  <in>color.h</in>
-                  <in>colordata.h</in>
-                  <in>fontconfig.h</in>
                   <in>fontpath.c</in>
-                  <in>img_util_md.h</in>
-                </df>
-                <df name="font">
-                  <in>X11FontScaler.h</in>
                 </df>
                 <df name="java2d">
                   <df name="opengl">
-                    <df name="J2D_GL">
-                      <in>glx.h</in>
-                      <in>glxext.h</in>
-                    </df>
                     <in>GLXGraphicsConfig.c</in>
-                    <in>GLXGraphicsConfig.h</in>
                     <in>GLXSurfaceData.c</in>
-                    <in>GLXSurfaceData.h</in>
-                    <in>OGLFuncs_md.h</in>
                   </df>
                   <df name="x11">
                     <in>X11FontScaler_md.c</in>
                     <in>X11PMBlitLoops.c</in>
                     <in>X11Renderer.c</in>
                     <in>X11SurfaceData.c</in>
-                    <in>X11SurfaceData.h</in>
                     <in>X11TextRenderer_md.c</in>
                   </df>
                 </df>
               </df>
-              <df name="include">
-                <in>jawt_md.h</in>
-              </df>
               <df name="libawt">
                 <df name="awt">
                   <in>awt_LoadLibrary.c</in>
                   <in>awt_Mlib.c</in>
                   <in>initIDs.c</in>
                 </df>
-                <df name="java2d">
-                  <df name="loops">
-                    <in>java2d_Mlib.c</in>
-                    <in>java2d_Mlib.h</in>
-                    <in>mlib_ImageCopy.h</in>
-                    <in>mlib_ImageLogic_proto.h</in>
-                    <in>mlib_ImageZoom.h</in>
-                    <in>mlib_ImageZoom_NN.c</in>
-                    <in>mlib_v_ImageClear.c</in>
-                    <in>mlib_v_ImageClear_f.c</in>
-                    <in>mlib_v_ImageClear_f.h</in>
-                    <in>mlib_v_ImageConstLogic.h</in>
-                    <in>mlib_v_ImageConstXor.c</in>
-                    <in>mlib_v_ImageLogic.h</in>
-                    <in>mlib_v_ImageLogic_proto.h</in>
-                    <in>mlib_v_ImageXor.c</in>
-                    <in>mlib_v_ImageZoom_NN_f.c</in>
-                    <in>vis_AlphaMacros.c</in>
-                    <in>vis_AlphaMacros.h</in>
-                    <in>vis_AlphaMaskBlit.c</in>
-                    <in>vis_AlphaMaskFill.c</in>
-                    <in>vis_ByteGray.c</in>
-                    <in>vis_ByteGray_FromRgb.c</in>
-                    <in>vis_ByteGray_Mask.c</in>
-                    <in>vis_ByteIndexed.c</in>
-                    <in>vis_DrawLine.c</in>
-                    <in>vis_FourByteAbgr.c</in>
-                    <in>vis_FourByteAbgrPre.c</in>
-                    <in>vis_FuncArray.c</in>
-                    <in>vis_GlyphList.c</in>
-                    <in>vis_GlyphListXor.c</in>
-                    <in>vis_IntArgb.c</in>
-                    <in>vis_IntArgbBm.c</in>
-                    <in>vis_IntArgbPre.c</in>
-                    <in>vis_IntArgbPre_Mask.c</in>
-                    <in>vis_IntBgr.c</in>
-                    <in>vis_IntRgb.c</in>
-                    <in>vis_IntRgbx.c</in>
-                    <in>vis_Interp.c</in>
-                    <in>vis_SrcMaskFill.c</in>
-                    <in>vis_SrcOverMaskBlit.c</in>
-                    <in>vis_SrcOverMaskFill.c</in>
-                    <in>vis_ThreeByteBgr.c</in>
-                    <in>vis_UshortGray.c</in>
-                    <in>vis_UshortGray_FromRgb.c</in>
-                    <in>vis_XorBlit.c</in>
-                  </df>
-                  <in>j2d_md.h</in>
-                </df>
               </df>
               <df name="libawt_headless">
                 <df name="awt">
                   <in>HeadlessToolkit.c</in>
                 </df>
               </df>
               <df name="libawt_xawt">
                 <df name="awt">
-                  <in>HPkeysym.h</in>
-                  <in>Xrandr.h</in>
                   <in>awt_AWTEvent.c</in>
-                  <in>awt_AWTEvent.h</in>
                   <in>awt_DrawingSurface.c</in>
                   <in>awt_Event.c</in>
-                  <in>awt_Event.h</in>
                   <in>awt_GraphicsEnv.c</in>
                   <in>awt_InputMethod.c</in>
                   <in>awt_Insets.c</in>
-                  <in>awt_Insets.h</in>
-                  <in>awt_MenuComponent.h</in>
                   <in>awt_Robot.c</in>
                   <in>awt_UNIXToolkit.c</in>
                   <in>awt_util.c</in>
-                  <in>canvas.h</in>
                   <in>gtk2_interface.c</in>
-                  <in>gtk2_interface.h</in>
                   <in>gtk3_interface.c</in>
-                  <in>gtk3_interface.h</in>
                   <in>gtk_interface.c</in>
-                  <in>gtk_interface.h</in>
                   <in>list.c</in>
-                  <in>list.h</in>
                   <in>multiVis.c</in>
-                  <in>multiVis.h</in>
                   <in>multi_font.c</in>
-                  <in>multi_font.h</in>
-                  <in>randr.h</in>
-                  <in>robot_common.c</in>
-                  <in>robot_common.h</in>
                   <in>sun_awt_X11_GtkFileDialogPeer.c</in>
                   <in>swing_GTKEngine.c</in>
                   <in>swing_GTKStyle.c</in>
-                  <in>wsutils.h</in>
                 </df>
                 <df name="java2d">
                   <df name="x11">
                     <in>XRBackendNative.c</in>
                     <in>XRSurfaceData.c</in>

@@ -4607,461 +1835,77 @@
                   <in>XToolkit.c</in>
                   <in>XWindow.c</in>
                   <in>XlibWrapper.c</in>
                   <in>awt_Desktop.c</in>
                   <in>awt_Taskbar.c</in>
-                  <in>awt_Taskbar.h</in>
                   <in>gnome_interface.c</in>
-                  <in>gnome_interface.h</in>
                 </df>
               </df>
               <df name="libfontmanager">
                 <in>X11FontScaler.c</in>
                 <in>X11TextRenderer.c</in>
               </df>
               <df name="libjawt">
                 <in>jawt.c</in>
               </df>
-              <df name="libjsound">
-                <in>PLATFORM_API_BsdOS_ALSA_CommonUtils.c</in>
-                <in>PLATFORM_API_BsdOS_ALSA_CommonUtils.h</in>
-                <in>PLATFORM_API_BsdOS_ALSA_MidiIn.c</in>
-                <in>PLATFORM_API_BsdOS_ALSA_MidiOut.c</in>
-                <in>PLATFORM_API_BsdOS_ALSA_MidiUtils.c</in>
-                <in>PLATFORM_API_BsdOS_ALSA_MidiUtils.h</in>
-                <in>PLATFORM_API_BsdOS_ALSA_PCM.c</in>
-                <in>PLATFORM_API_BsdOS_ALSA_PCMUtils.c</in>
-                <in>PLATFORM_API_BsdOS_ALSA_PCMUtils.h</in>
-                <in>PLATFORM_API_BsdOS_ALSA_Ports.c</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_CommonUtils.c</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_CommonUtils.h</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_MidiIn.c</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_MidiOut.c</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_MidiUtils.c</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_MidiUtils.h</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_PCM.c</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_PCMUtils.c</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_PCMUtils.h</in>
-                <in>PLATFORM_API_LinuxOS_ALSA_Ports.c</in>
-                <in>PLATFORM_API_SolarisOS_PCM.c</in>
-                <in>PLATFORM_API_SolarisOS_Ports.c</in>
-                <in>PLATFORM_API_SolarisOS_Utils.c</in>
-                <in>PLATFORM_API_SolarisOS_Utils.h</in>
-              </df>
-              <df name="libmlib_image">
-                <in>mlib_ImageConvCopyEdge_Fp.c</in>
-                <in>mlib_v_ImageAffine_BC.c</in>
-                <in>mlib_v_ImageAffine_BC_S16.c</in>
-                <in>mlib_v_ImageAffine_BC_U16.c</in>
-                <in>mlib_v_ImageAffine_BL.c</in>
-                <in>mlib_v_ImageAffine_BL_S16.c</in>
-                <in>mlib_v_ImageAffine_BL_S16.h</in>
-                <in>mlib_v_ImageAffine_BL_U16.c</in>
-                <in>mlib_v_ImageAffine_NN.c</in>
-                <in>mlib_v_ImageChannelExtract.h</in>
-                <in>mlib_v_ImageChannelExtract_1.c</in>
-                <in>mlib_v_ImageChannelExtract_43.c</in>
-                <in>mlib_v_ImageChannelInsert.h</in>
-                <in>mlib_v_ImageChannelInsert_1.c</in>
-                <in>mlib_v_ImageConv.h</in>
-                <in>mlib_v_ImageConvClearEdge.c</in>
-                <in>mlib_v_ImageConvCopyEdge.c</in>
-                <in>mlib_v_ImageConvMxN_8.c</in>
-                <in>mlib_v_ImageConvMxN_8ext.c</in>
-                <in>mlib_v_ImageConvVersion.c</in>
-                <in>mlib_v_ImageConv_8nw.c</in>
-                <in>mlib_v_ImageFilters.c</in>
-                <in>mlib_v_ImageFilters.h</in>
-                <in>mlib_v_ImageLookUp.c</in>
-                <in>mlib_v_ImageLookUpFunc.h</in>
-                <in>mlib_v_ImageLookUpS16S16Func.c</in>
-                <in>mlib_v_ImageLookUpS16S32Func.c</in>
-                <in>mlib_v_ImageLookUpS16U16Func.c</in>
-                <in>mlib_v_ImageLookUpS16U8Func.c</in>
-                <in>mlib_v_ImageLookUpS32S16Func.c</in>
-                <in>mlib_v_ImageLookUpS32S32Func.c</in>
-                <in>mlib_v_ImageLookUpS32U16Func.c</in>
-                <in>mlib_v_ImageLookUpS32U8Func.c</in>
-                <in>mlib_v_ImageLookUpSIS16S16Func.c</in>
-                <in>mlib_v_ImageLookUpSIS16S32Func.c</in>
-                <in>mlib_v_ImageLookUpSIS16U16Func.c</in>
-                <in>mlib_v_ImageLookUpSIS16U8Func.c</in>
-                <in>mlib_v_ImageLookUpSIS32S16Func.c</in>
-                <in>mlib_v_ImageLookUpSIS32S32Func.c</in>
-                <in>mlib_v_ImageLookUpSIS32U16Func.c</in>
-                <in>mlib_v_ImageLookUpSIS32U8Func.c</in>
-                <in>mlib_v_ImageLookUpSIU16S16Func.c</in>
-                <in>mlib_v_ImageLookUpSIU16S32Func.c</in>
-                <in>mlib_v_ImageLookUpSIU16U16Func.c</in>
-                <in>mlib_v_ImageLookUpSIU16U8Func.c</in>
-                <in>mlib_v_ImageLookUpSIU8S16Func.c</in>
-                <in>mlib_v_ImageLookUpSIU8S32Func.c</in>
-                <in>mlib_v_ImageLookUpSIU8U16Func.c</in>
-                <in>mlib_v_ImageLookUpSIU8U8Func.c</in>
-                <in>mlib_v_ImageLookUpU16S16Func.c</in>
-                <in>mlib_v_ImageLookUpU16S32Func.c</in>
-                <in>mlib_v_ImageLookUpU16U16Func.c</in>
-                <in>mlib_v_ImageLookUpU16U8Func.c</in>
-                <in>mlib_v_ImageLookUpU8S16Func.c</in>
-                <in>mlib_v_ImageLookUpU8S32Func.c</in>
-                <in>mlib_v_ImageLookUpU8U16Func.c</in>
-                <in>mlib_v_ImageLookUpU8U8Func.c</in>
-                <in>vis_32.il</in>
-                <in>vis_64.il</in>
-              </df>
-              <df name="libsplashscreen">
-                <in>splashscreen_config.h</in>
-                <in>splashscreen_sys.c</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="common">
-                <df name="awt">
-                  <df name="systemscale">
-                    <in>systemScale.cpp</in>
-                    <in>systemScale.h</in>
-                  </df>
-                  <df name="utility">
-                    <in>rect.h</in>
-                  </df>
-                </df>
-                <in>awt_makecube.cpp</in>
-              </df>
-              <df name="include">
-                <in>jawt_md.h</in>
-              </df>
-              <df name="libawt">
-                <df name="java2d">
-                  <df name="d3d">
-                    <in>D3DBadHardware.h</in>
-                    <in>D3DBlitLoops.cpp</in>
-                    <in>D3DBlitLoops.h</in>
-                    <in>D3DBufImgOps.cpp</in>
-                    <in>D3DBufImgOps.h</in>
-                    <in>D3DContext.cpp</in>
-                    <in>D3DContext.h</in>
-                    <in>D3DGlyphCache.cpp</in>
-                    <in>D3DGlyphCache.h</in>
-                    <in>D3DGraphicsDevice.cpp</in>
-                    <in>D3DGraphicsDevice.h</in>
-                    <in>D3DMaskBlit.cpp</in>
-                    <in>D3DMaskBlit.h</in>
-                    <in>D3DMaskCache.cpp</in>
-                    <in>D3DMaskCache.h</in>
-                    <in>D3DMaskFill.cpp</in>
-                    <in>D3DMaskFill.h</in>
-                    <in>D3DPaints.cpp</in>
-                    <in>D3DPaints.h</in>
-                    <in>D3DPipeline.h</in>
-                    <in>D3DPipelineManager.cpp</in>
-                    <in>D3DPipelineManager.h</in>
-                    <in>D3DRenderQueue.cpp</in>
-                    <in>D3DRenderQueue.h</in>
-                    <in>D3DRenderer.cpp</in>
-                    <in>D3DRenderer.h</in>
-                    <in>D3DResourceManager.cpp</in>
-                    <in>D3DResourceManager.h</in>
-                    <in>D3DShaderGen.c</in>
-                    <in>D3DShaders.h</in>
-                    <in>D3DSurfaceData.cpp</in>
-                    <in>D3DSurfaceData.h</in>
-                    <in>D3DTextRenderer.cpp</in>
-                    <in>D3DTextRenderer.h</in>
-                    <in>D3DVertexCacher.cpp</in>
-                    <in>D3DVertexCacher.h</in>
-                    <in>ShaderList.c</in>
-                    <in>ShaderList.h</in>
-                  </df>
-                  <df name="opengl">
-                    <df name="J2D_GL">
-                      <in>wglext.h</in>
-                    </df>
-                    <in>OGLFuncs_md.h</in>
-                    <in>WGLGraphicsConfig.c</in>
-                    <in>WGLGraphicsConfig.h</in>
-                    <in>WGLSurfaceData.c</in>
-                    <in>WGLSurfaceData.h</in>
-                  </df>
-                  <df name="windows">
-                    <in>GDIBlitLoops.cpp</in>
-                    <in>GDIRenderer.cpp</in>
-                    <in>GDIWindowSurfaceData.cpp</in>
-                    <in>GDIWindowSurfaceData.h</in>
-                    <in>WindowsFlags.cpp</in>
-                    <in>WindowsFlags.h</in>
-                  </df>
-                  <in>j2d_md.h</in>
-                </df>
-                <df name="windows">
-                  <in>CmdIDList.cpp</in>
-                  <in>CmdIDList.h</in>
-                  <in>ComCtl32Util.cpp</in>
-                  <in>ComCtl32Util.h</in>
-                  <in>Devices.cpp</in>
-                  <in>Devices.h</in>
-                  <in>DllUtil.cpp</in>
-                  <in>DllUtil.h</in>
-                  <in>GDIHashtable.cpp</in>
-                  <in>GDIHashtable.h</in>
-                  <in>Hashtable.cpp</in>
-                  <in>Hashtable.h</in>
-                  <in>MouseInfo.cpp</in>
-                  <in>ObjectList.cpp</in>
-                  <in>ObjectList.h</in>
-                  <in>ShellFolder2.cpp</in>
-                  <in>ThemeReader.cpp</in>
-                  <in>WPrinterJob.cpp</in>
-                  <in>alloc.h</in>
-                  <in>awt.h</in>
-                  <in>awt_AWTEvent.cpp</in>
-                  <in>awt_AWTEvent.h</in>
-                  <in>awt_BitmapUtil.cpp</in>
-                  <in>awt_BitmapUtil.h</in>
-                  <in>awt_Brush.cpp</in>
-                  <in>awt_Brush.h</in>
-                  <in>awt_Button.cpp</in>
-                  <in>awt_Button.h</in>
-                  <in>awt_Canvas.cpp</in>
-                  <in>awt_Canvas.h</in>
-                  <in>awt_Checkbox.cpp</in>
-                  <in>awt_Checkbox.h</in>
-                  <in>awt_Choice.cpp</in>
-                  <in>awt_Choice.h</in>
-                  <in>awt_Clipboard.cpp</in>
-                  <in>awt_Clipboard.h</in>
-                  <in>awt_Color.cpp</in>
-                  <in>awt_Color.h</in>
-                  <in>awt_Component.cpp</in>
-                  <in>awt_Component.h</in>
-                  <in>awt_Container.cpp</in>
-                  <in>awt_Container.h</in>
-                  <in>awt_Cursor.cpp</in>
-                  <in>awt_Cursor.h</in>
-                  <in>awt_CustomPaletteDef.h</in>
-                  <in>awt_DCHolder.cpp</in>
-                  <in>awt_DCHolder.h</in>
-                  <in>awt_DataTransferer.cpp</in>
-                  <in>awt_DataTransferer.h</in>
-                  <in>awt_Debug.cpp</in>
-                  <in>awt_Debug.h</in>
-                  <in>awt_Desktop.cpp</in>
-                  <in>awt_DesktopProperties.cpp</in>
-                  <in>awt_DesktopProperties.h</in>
-                  <in>awt_Dialog.cpp</in>
-                  <in>awt_Dialog.h</in>
-                  <in>awt_Dimension.cpp</in>
-                  <in>awt_Dimension.h</in>
-                  <in>awt_DnDDS.cpp</in>
-                  <in>awt_DnDDS.h</in>
-                  <in>awt_DnDDT.cpp</in>
-                  <in>awt_DnDDT.h</in>
-                  <in>awt_DrawingSurface.cpp</in>
-                  <in>awt_DrawingSurface.h</in>
-                  <in>awt_Event.cpp</in>
-                  <in>awt_Event.h</in>
-                  <in>awt_FileDialog.cpp</in>
-                  <in>awt_FileDialog.h</in>
-                  <in>awt_Font.cpp</in>
-                  <in>awt_Font.h</in>
-                  <in>awt_Frame.cpp</in>
-                  <in>awt_Frame.h</in>
-                  <in>awt_GDIObject.cpp</in>
-                  <in>awt_GDIObject.h</in>
-                  <in>awt_IconCursor.cpp</in>
-                  <in>awt_IconCursor.h</in>
-                  <in>awt_InputEvent.cpp</in>
-                  <in>awt_InputEvent.h</in>
-                  <in>awt_InputMethod.cpp</in>
-                  <in>awt_InputTextInfor.cpp</in>
-                  <in>awt_InputTextInfor.h</in>
-                  <in>awt_Insets.cpp</in>
-                  <in>awt_Insets.h</in>
-                  <in>awt_KeyEvent.cpp</in>
-                  <in>awt_KeyEvent.h</in>
-                  <in>awt_KeyboardFocusManager.cpp</in>
-                  <in>awt_Label.cpp</in>
-                  <in>awt_Label.h</in>
-                  <in>awt_List.cpp</in>
-                  <in>awt_List.h</in>
-                  <in>awt_Menu.cpp</in>
-                  <in>awt_Menu.h</in>
-                  <in>awt_MenuBar.cpp</in>
-                  <in>awt_MenuBar.h</in>
-                  <in>awt_MenuItem.cpp</in>
-                  <in>awt_MenuItem.h</in>
-                  <in>awt_Mlib.cpp</in>
-                  <in>awt_Mlib.h</in>
-                  <in>awt_MouseEvent.cpp</in>
-                  <in>awt_MouseEvent.h</in>
-                  <in>awt_Object.cpp</in>
-                  <in>awt_Object.h</in>
-                  <in>awt_Palette.cpp</in>
-                  <in>awt_Palette.h</in>
-                  <in>awt_Panel.cpp</in>
-                  <in>awt_Panel.h</in>
-                  <in>awt_Pen.cpp</in>
-                  <in>awt_Pen.h</in>
-                  <in>awt_PopupMenu.cpp</in>
-                  <in>awt_PopupMenu.h</in>
-                  <in>awt_PrintControl.cpp</in>
-                  <in>awt_PrintControl.h</in>
-                  <in>awt_PrintDialog.cpp</in>
-                  <in>awt_PrintDialog.h</in>
-                  <in>awt_PrintJob.cpp</in>
-                  <in>awt_Rectangle.cpp</in>
-                  <in>awt_Rectangle.h</in>
-                  <in>awt_Robot.cpp</in>
-                  <in>awt_Robot.h</in>
-                  <in>awt_ScrollPane.cpp</in>
-                  <in>awt_ScrollPane.h</in>
-                  <in>awt_Scrollbar.cpp</in>
-                  <in>awt_Scrollbar.h</in>
-                  <in>awt_Taskbar.cpp</in>
-                  <in>awt_Taskbar.h</in>
-                  <in>awt_TextArea.cpp</in>
-                  <in>awt_TextArea.h</in>
-                  <in>awt_TextComponent.cpp</in>
-                  <in>awt_TextComponent.h</in>
-                  <in>awt_TextField.cpp</in>
-                  <in>awt_TextField.h</in>
-                  <in>awt_Toolkit.cpp</in>
-                  <in>awt_Toolkit.h</in>
-                  <in>awt_TrayIcon.cpp</in>
-                  <in>awt_TrayIcon.h</in>
-                  <in>awt_Win32GraphicsConfig.cpp</in>
-                  <in>awt_Win32GraphicsConfig.h</in>
-                  <in>awt_Win32GraphicsDevice.cpp</in>
-                  <in>awt_Win32GraphicsDevice.h</in>
-                  <in>awt_Win32GraphicsEnv.cpp</in>
-                  <in>awt_Window.cpp</in>
-                  <in>awt_Window.h</in>
-                  <in>awt_new.cpp</in>
-                  <in>awt_new.h</in>
-                  <in>awt_ole.cpp</in>
-                  <in>awt_ole.h</in>
-                  <in>awtmsg.h</in>
-                  <in>colordata.h</in>
-                  <in>img_util_md.h</in>
-                  <in>initIDs.cpp</in>
-                  <in>mlib_types_md.h</in>
-                  <in>stdhdrs.h</in>
-                </df>
-              </df>
-              <df name="libfontmanager">
-                <in>fontpath.c</in>
-                <in>lcdglyph.c</in>
-              </df>
-              <df name="libjawt">
-                <in>jawt.cpp</in>
-              </df>
-              <df name="libjsound">
-                <in>PLATFORM_API_WinOS_Charset_Util.cpp</in>
-                <in>PLATFORM_API_WinOS_Charset_Util.h</in>
-                <in>PLATFORM_API_WinOS_DirectSound.cpp</in>
-                <in>PLATFORM_API_WinOS_MidiIn.cpp</in>
-                <in>PLATFORM_API_WinOS_MidiOut.c</in>
-                <in>PLATFORM_API_WinOS_Ports.c</in>
-                <in>PLATFORM_API_WinOS_Util.c</in>
-                <in>PLATFORM_API_WinOS_Util.h</in>
-              </df>
               <df name="libsplashscreen">
-                <in>splashscreen_config.h</in>
                 <in>splashscreen_sys.c</in>
               </df>
             </df>
           </df>
         </df>
         <df name="java.instrument">
           <df name="share">
             <df name="native">
               <df name="libinstrument">
                 <in>EncodingSupport.c</in>
-                <in>EncodingSupport.h</in>
-                <in>FileSystemSupport.h</in>
                 <in>InstrumentationImplNativeMethods.c</in>
                 <in>InvocationAdapter.c</in>
                 <in>JPLISAgent.c</in>
-                <in>JPLISAgent.h</in>
                 <in>JPLISAssert.c</in>
-                <in>JPLISAssert.h</in>
                 <in>JarFacade.c</in>
-                <in>JarFacade.h</in>
                 <in>JavaExceptions.c</in>
-                <in>JavaExceptions.h</in>
                 <in>PathCharsValidator.c</in>
-                <in>PathCharsValidator.h</in>
                 <in>Reentrancy.c</in>
-                <in>Reentrancy.h</in>
                 <in>Utilities.c</in>
-                <in>Utilities.h</in>
               </df>
             </df>
           </df>
           <df name="unix">
             <df name="native">
               <df name="libinstrument">
                 <in>EncodingSupport_md.c</in>
                 <in>FileSystemSupport_md.c</in>
-                <in>FileSystemSupport_md.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libinstrument">
-                <in>EncodingSupport_md.c</in>
-                <in>FileSystemSupport_md.c</in>
-                <in>FileSystemSupport_md.h</in>
               </df>
             </df>
           </df>
         </df>
         <df name="java.management">
           <df name="share">
             <df name="native">
-              <df name="include">
-                <in>jmm.h</in>
-              </df>
               <df name="libmanagement">
                 <in>ClassLoadingImpl.c</in>
                 <in>GarbageCollectorImpl.c</in>
                 <in>HotspotThread.c</in>
                 <in>MemoryImpl.c</in>
                 <in>MemoryManagerImpl.c</in>
                 <in>MemoryPoolImpl.c</in>
                 <in>ThreadImpl.c</in>
                 <in>VMManagementImpl.c</in>
                 <in>management.c</in>
-                <in>management.h</in>
               </df>
             </df>
           </df>
         </df>
         <df name="java.prefs">
-          <df name="macosx">
-            <df name="native">
-              <df name="libprefs">
-                <in>MacOSXPreferencesFile.m</in>
-              </df>
-            </df>
-          </df>
           <df name="unix">
             <df name="native">
               <df name="libprefs">
                 <in>FileSystemPreferences.c</in>
               </df>
             </df>
           </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libprefs">
-                <in>WindowsPreferences.c</in>
-              </df>
-            </df>
-          </df>
         </df>
         <df name="java.rmi">
           <df name="share">
             <df name="native">
               <df name="librmi">

@@ -5069,41 +1913,16 @@
               </df>
             </df>
           </df>
         </df>
         <df name="java.security.jgss">
-          <df name="macosx">
-            <df name="native">
-              <df name="libosxkrb5">
-                <in>SCDynamicStoreConfig.m</in>
-                <in>nativeccache.c</in>
-              </df>
-            </df>
-          </df>
           <df name="share">
             <df name="native">
               <df name="libj2gss">
                 <in>GSSLibStub.c</in>
-                <in>NativeUtil.c</in>
-                <in>NativeUtil.h</in>
-                <in>gssapi.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="unix">
-            <df name="native">
-              <df name="libj2gss">
                 <in>NativeFunc.c</in>
-                <in>NativeFunc.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libw2k_lsa_auth">
-                <in>NativeCreds.c</in>
-                <in>WindowsDirectory.c</in>
+                <in>NativeUtil.c</in>
               </df>
             </df>
           </df>
         </df>
         <df name="java.smartcardio">

@@ -5115,138 +1934,29 @@
             </df>
           </df>
           <df name="unix">
             <df name="native">
               <df name="libj2pcsc">
-                <df name="MUSCLE">
-                  <in>pcsclite.h</in>
-                  <in>winscard.h</in>
-                </df>
-                <in>pcsc_md.c</in>
-                <in>pcsc_md.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libj2pcsc">
                 <in>pcsc_md.c</in>
-                <in>pcsc_md.h</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.accessibility">
-          <df name="windows">
-            <df name="native">
-              <df name="bridge">
-                <in>AccessBridgeCalls.c</in>
-              </df>
-              <df name="common">
-                <in>AccessBridgeDebug.cpp</in>
-                <in>AccessBridgeDebug.h</in>
-                <in>AccessBridgeMessages.cpp</in>
-                <in>AccessBridgeMessages.h</in>
-                <in>accessBridgeResource.h</in>
-                <in>resource.h</in>
-              </df>
-              <df name="include">
-                <df name="bridge">
-                  <in>AccessBridgeCallbacks.h</in>
-                  <in>AccessBridgeCalls.h</in>
-                  <in>AccessBridgePackages.h</in>
-                </df>
-              </df>
-              <df name="jabswitch">
-                <in>jabswitch.cpp</in>
-              </df>
-              <df name="jaccessinspector">
-                <in>MessageHistory.cpp</in>
-                <in>MessageHistory.h</in>
-                <in>jaccessinspector.cpp</in>
-                <in>jaccessinspector.h</in>
-                <in>jaccessinspectorResource.h</in>
-              </df>
-              <df name="jaccesswalker">
-                <in>jaccesswalker.cpp</in>
-                <in>jaccesswalker.h</in>
-                <in>jaccesswalkerResource.h</in>
-              </df>
-              <df name="libjabsysinfo">
-                <in>AccessBridgeSysInfo.cpp</in>
-              </df>
-              <df name="libjavaaccessbridge">
-                <in>AccessBridgeATInstance.cpp</in>
-                <in>AccessBridgeATInstance.h</in>
-                <in>AccessBridgeJavaEntryPoints.cpp</in>
-                <in>AccessBridgeJavaEntryPoints.h</in>
-                <in>JavaAccessBridge.cpp</in>
-                <in>JavaAccessBridge.h</in>
-              </df>
-              <df name="libwindowsaccessbridge">
-                <in>AccessBridgeEventHandler.cpp</in>
-                <in>AccessBridgeEventHandler.h</in>
-                <in>AccessBridgeJavaVMInstance.cpp</in>
-                <in>AccessBridgeJavaVMInstance.h</in>
-                <in>AccessBridgeMessageQueue.cpp</in>
-                <in>AccessBridgeMessageQueue.h</in>
-                <in>AccessBridgeWindowsEntryPoints.cpp</in>
-                <in>AccessBridgeWindowsEntryPoints.h</in>
-                <in>WinAccessBridge.cpp</in>
-                <in>WinAccessBridge.h</in>
-              </df>
-              <df name="toolscommon">
-                <in>AccessInfo.cpp</in>
-                <in>AccessInfo.h</in>
               </df>
             </df>
           </df>
         </df>
         <df name="jdk.attach">
-          <df name="aix">
-            <df name="native">
-              <df name="libattach">
-                <in>VirtualMachineImpl.c</in>
-              </df>
-            </df>
-          </df>
           <df name="linux">
             <df name="native">
               <df name="libattach">
                 <in>VirtualMachineImpl.c</in>
               </df>
             </df>
           </df>
-          <df name="macosx">
-            <df name="native">
-              <df name="libattach">
-                <in>VirtualMachineImpl.c</in>
-              </df>
-            </df>
-          </df>
-          <df name="solaris">
-            <df name="native">
-              <df name="libattach">
-                <in>VirtualMachineImpl.c</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libattach">
-                <in>AttachProviderImpl.c</in>
-                <in>VirtualMachineImpl.c</in>
-              </df>
-            </df>
-          </df>
         </df>
         <df name="jdk.crypto.cryptoki">
           <df name="share">
             <df name="native">
               <df name="libj2pkcs11">
                 <in>j2secmod.c</in>
-                <in>j2secmod.h</in>
                 <in>p11_convert.c</in>
                 <in>p11_crypt.c</in>
                 <in>p11_digest.c</in>
                 <in>p11_dual.c</in>
                 <in>p11_general.c</in>

@@ -5254,540 +1964,199 @@
                 <in>p11_mutex.c</in>
                 <in>p11_objmgmt.c</in>
                 <in>p11_sessmgmt.c</in>
                 <in>p11_sign.c</in>
                 <in>p11_util.c</in>
-                <in>pkcs-11v2-20a3.h</in>
-                <in>pkcs11.h</in>
-                <in>pkcs11f.h</in>
-                <in>pkcs11t.h</in>
-                <in>pkcs11wrapper.h</in>
               </df>
             </df>
           </df>
           <df name="unix">
             <df name="native">
               <df name="libj2pkcs11">
                 <in>j2secmod_md.c</in>
-                <in>j2secmod_md.h</in>
-                <in>p11_md.c</in>
-                <in>p11_md.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libj2pkcs11">
-                <in>j2secmod_md.c</in>
-                <in>j2secmod_md.h</in>
                 <in>p11_md.c</in>
-                <in>p11_md.h</in>
               </df>
             </df>
           </df>
         </df>
         <df name="jdk.crypto.ec">
           <df name="share">
             <df name="native">
               <df name="libsunec">
                 <df name="impl">
                   <in>ec.c</in>
-                  <in>ec.h</in>
-                  <in>ec2.h</in>
                   <in>ec2_163.c</in>
                   <in>ec2_193.c</in>
                   <in>ec2_233.c</in>
                   <in>ec2_aff.c</in>
                   <in>ec2_mont.c</in>
                   <in>ec_naf.c</in>
-                  <in>ecc_impl.h</in>
                   <in>ecdecode.c</in>
-                  <in>ecl-curve.h</in>
-                  <in>ecl-exp.h</in>
-                  <in>ecl-priv.h</in>
                   <in>ecl.c</in>
-                  <in>ecl.h</in>
                   <in>ecl_curve.c</in>
                   <in>ecl_gf.c</in>
                   <in>ecl_mult.c</in>
-                  <in>ecp.h</in>
                   <in>ecp_192.c</in>
                   <in>ecp_224.c</in>
                   <in>ecp_256.c</in>
                   <in>ecp_384.c</in>
                   <in>ecp_521.c</in>
                   <in>ecp_aff.c</in>
                   <in>ecp_jac.c</in>
                   <in>ecp_jm.c</in>
                   <in>ecp_mont.c</in>
-                  <in>logtab.h</in>
-                  <in>mp_gf2m-priv.h</in>
                   <in>mp_gf2m.c</in>
-                  <in>mp_gf2m.h</in>
-                  <in>mpi-config.h</in>
-                  <in>mpi-priv.h</in>
                   <in>mpi.c</in>
-                  <in>mpi.h</in>
                   <in>mplogic.c</in>
-                  <in>mplogic.h</in>
                   <in>mpmontg.c</in>
-                  <in>mpprime.h</in>
                   <in>oid.c</in>
                   <in>secitem.c</in>
-                  <in>secoidt.h</in>
                 </df>
                 <in>ECC_JNI.cpp</in>
               </df>
             </df>
           </df>
         </df>
-        <df name="jdk.crypto.mscapi">
-          <df name="windows">
-            <df name="native">
-              <df name="libsunmscapi">
-                <in>security.cpp</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.crypto.ucrypto">
-          <df name="solaris">
-            <df name="native">
-              <df name="libj2ucrypto">
-                <in>nativeCrypto.c</in>
-                <in>nativeCrypto.h</in>
-                <in>nativeCryptoMD.c</in>
-                <in>nativeFunc.c</in>
-                <in>nativeFunc.h</in>
-              </df>
-            </df>
-          </df>
-        </df>
         <df name="jdk.hotspot.agent">
           <df name="linux">
             <df name="native">
               <df name="libsaproc">
                 <in>LinuxDebuggerLocal.c</in>
-                <in>elfmacros.h</in>
-                <in>libproc.h</in>
-                <in>libproc_impl.c</in>
-                <in>libproc_impl.h</in>
-                <in>proc_service.h</in>
-                <in>ps_core.c</in>
-                <in>ps_proc.c</in>
-                <in>salibelf.c</in>
-                <in>salibelf.h</in>
-                <in>symtab.c</in>
-                <in>symtab.h</in>
-                <in>test.c</in>
-              </df>
-            </df>
-          </df>
-          <df name="macosx">
-            <df name="native">
-              <df name="libsaproc">
-                <in>BsdDebuggerLocal.c</in>
-                <in>MacosxDebuggerLocal.m</in>
-                <in>StubDebuggerLocal.c</in>
-                <in>elfmacros.h</in>
-                <in>libproc.h</in>
                 <in>libproc_impl.c</in>
-                <in>libproc_impl.h</in>
                 <in>ps_core.c</in>
                 <in>ps_proc.c</in>
                 <in>salibelf.c</in>
-                <in>salibelf.h</in>
                 <in>symtab.c</in>
-                <in>symtab.h</in>
-                <in>test.c</in>
               </df>
             </df>
           </df>
           <df name="share">
             <df name="native">
               <df name="libsaproc">
                 <in>sadis.c</in>
               </df>
             </df>
           </df>
-          <df name="solaris">
-            <df name="native">
-              <df name="libsaproc">
-                <in>libproc.h</in>
-                <in>salibproc.h</in>
-                <in>saproc.cpp</in>
-                <in>saproc_audit.cpp</in>
-              </df>
             </df>
-          </df>
-          <df name="windows">
+        <df name="jdk.jdwp.agent">
+          <df name="share">
             <df name="native">
-              <df name="libsaproc">
-                <in>sawindbg.cpp</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.internal.le">
-          <df name="windows">
-            <df name="native">
-              <df name="lible">
-                <in>WindowsTerminal.cpp</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.internal.vm.compiler">
-          <df name="share">
-            <df name="classes">
-              <df name="org.graalvm.compiler.core">
-                <df name="src">
-                  <df name="org">
-                    <df name="graalvm">
-                      <df name="compiler">
-                        <df name="core">
-                          <df name="doc-files">
-                            <in>CompilationBailoutActionHelp.txt</in>
-                          </df>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-              <df name="org.graalvm.compiler.debug">
-                <df name="src">
-                  <df name="org">
-                    <df name="graalvm">
-                      <df name="compiler">
-                        <df name="debug">
-                          <df name="doc-files">
-                            <in>DumpHelp.txt</in>
-                            <in>MethodFilterHelp.txt</in>
-                            <in>MetricsFileHelp.txt</in>
-                          </df>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-              <df name="org.graalvm.compiler.hotspot">
-                <df name="src">
-                  <df name="org">
-                    <df name="graalvm">
-                      <df name="compiler">
-                        <df name="hotspot">
-                          <df name="debug">
-                            <df name="doc-files">
-                              <in>BenchmarkDynamicCountersHelp.txt</in>
-                            </df>
-                          </df>
-                          <df name="replacements">
-                            <df name="doc-files">
-                              <in>ProfileAllocationsContextHelp.txt</in>
-                            </df>
-                          </df>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.jdeps">
-          <df name="share">
-            <df name="classes">
-              <df name="com">
-                <df name="sun">
-                  <df name="tools">
-                    <df name="jdeps">
-                      <df name="resources">
-                        <in>jdk8_internals.txt</in>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.jdi">
-          <df name="share">
-            <df name="native">
-              <df name="libdt_shmem">
-                <in>SharedMemory.h</in>
-                <in>SharedMemoryConnection.c</in>
-                <in>SharedMemoryTransport.c</in>
-                <in>shmemBack.c</in>
-                <in>shmemBase.c</in>
-                <in>shmemBase.h</in>
-                <in>sysShmem.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libdt_shmem">
-                <in>shmem_md.c</in>
-                <in>shmem_md.h</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.jdwp.agent">
-          <df name="share">
-            <df name="native">
-              <df name="include">
-                <in>jdwpTransport.h</in>
-              </df>
-              <df name="libdt_socket">
-                <in>socketTransport.c</in>
-                <in>socketTransport.h</in>
-                <in>sysSocket.h</in>
+              <df name="libdt_socket">
+                <in>socketTransport.c</in>
               </df>
               <df name="libjdwp">
-                <df name="export">
-                  <in>sys.h</in>
-                </df>
                 <in>ArrayReferenceImpl.c</in>
-                <in>ArrayReferenceImpl.h</in>
                 <in>ArrayTypeImpl.c</in>
-                <in>ArrayTypeImpl.h</in>
                 <in>ClassLoaderReferenceImpl.c</in>
-                <in>ClassLoaderReferenceImpl.h</in>
                 <in>ClassObjectReferenceImpl.c</in>
-                <in>ClassObjectReferenceImpl.h</in>
                 <in>ClassTypeImpl.c</in>
-                <in>ClassTypeImpl.h</in>
                 <in>EventRequestImpl.c</in>
-                <in>EventRequestImpl.h</in>
                 <in>FieldImpl.c</in>
-                <in>FieldImpl.h</in>
                 <in>FrameID.c</in>
-                <in>FrameID.h</in>
                 <in>InterfaceTypeImpl.c</in>
-                <in>InterfaceTypeImpl.h</in>
-                <in>JDWP.h</in>
                 <in>MethodImpl.c</in>
-                <in>MethodImpl.h</in>
                 <in>ModuleReferenceImpl.c</in>
-                <in>ModuleReferenceImpl.h</in>
                 <in>ObjectReferenceImpl.c</in>
-                <in>ObjectReferenceImpl.h</in>
                 <in>ReferenceTypeImpl.c</in>
-                <in>ReferenceTypeImpl.h</in>
                 <in>SDE.c</in>
-                <in>SDE.h</in>
                 <in>StackFrameImpl.c</in>
-                <in>StackFrameImpl.h</in>
                 <in>StringReferenceImpl.c</in>
-                <in>StringReferenceImpl.h</in>
                 <in>ThreadGroupReferenceImpl.c</in>
-                <in>ThreadGroupReferenceImpl.h</in>
                 <in>ThreadReferenceImpl.c</in>
-                <in>ThreadReferenceImpl.h</in>
                 <in>VirtualMachineImpl.c</in>
-                <in>VirtualMachineImpl.h</in>
                 <in>bag.c</in>
-                <in>bag.h</in>
                 <in>classTrack.c</in>
-                <in>classTrack.h</in>
                 <in>commonRef.c</in>
-                <in>commonRef.h</in>
                 <in>debugDispatch.c</in>
-                <in>debugDispatch.h</in>
                 <in>debugInit.c</in>
-                <in>debugInit.h</in>
                 <in>debugLoop.c</in>
-                <in>debugLoop.h</in>
                 <in>error_messages.c</in>
-                <in>error_messages.h</in>
                 <in>eventFilter.c</in>
-                <in>eventFilter.h</in>
-                <in>eventFilterRestricted.h</in>
                 <in>eventHandler.c</in>
-                <in>eventHandler.h</in>
-                <in>eventHandlerRestricted.h</in>
                 <in>eventHelper.c</in>
-                <in>eventHelper.h</in>
                 <in>inStream.c</in>
-                <in>inStream.h</in>
                 <in>invoker.c</in>
-                <in>invoker.h</in>
                 <in>log_messages.c</in>
-                <in>log_messages.h</in>
                 <in>outStream.c</in>
-                <in>outStream.h</in>
                 <in>standardHandlers.c</in>
-                <in>standardHandlers.h</in>
                 <in>stepControl.c</in>
-                <in>stepControl.h</in>
                 <in>stream.c</in>
-                <in>stream.h</in>
                 <in>threadControl.c</in>
-                <in>threadControl.h</in>
                 <in>transport.c</in>
-                <in>transport.h</in>
                 <in>utf_util.c</in>
-                <in>utf_util.h</in>
                 <in>util.c</in>
-                <in>util.h</in>
-                <in>vm_interface.h</in>
               </df>
             </df>
           </df>
           <df name="unix">
             <df name="native">
               <df name="libdt_socket">
                 <in>socket_md.c</in>
-                <in>socket_md.h</in>
-              </df>
-              <df name="libjdwp">
-                <in>exec_md.c</in>
-                <in>linker_md.c</in>
-                <in>path_md.h</in>
-                <in>proc_md.h</in>
-                <in>util_md.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libdt_socket">
-                <in>socket_md.c</in>
-                <in>socket_md.h</in>
               </df>
               <df name="libjdwp">
                 <in>exec_md.c</in>
                 <in>linker_md.c</in>
-                <in>mutex_md.h</in>
-                <in>path_md.h</in>
-                <in>proc_md.h</in>
-                <in>util_md.h</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="jdk.localedata">
-          <df name="share">
-            <df name="classes">
-              <df name="sun">
-                <df name="util">
-                  <df name="cldr">
-                    <df name="resources">
-                      <in>unicode-license.txt</in>
-                    </df>
-                  </df>
-                </df>
               </df>
             </df>
           </df>
         </df>
         <df name="jdk.management">
-          <df name="aix">
-            <df name="native">
-              <df name="libmanagement_ext">
-                <in>UnixOperatingSystem.c</in>
-              </df>
-            </df>
-          </df>
           <df name="linux">
             <df name="native">
               <df name="libmanagement_ext">
                 <in>UnixOperatingSystem.c</in>
               </df>
             </df>
           </df>
-          <df name="macosx">
-            <df name="native">
-              <df name="libmanagement_ext">
-                <in>UnixOperatingSystem.c</in>
-              </df>
-            </df>
-          </df>
           <df name="share">
             <df name="native">
               <df name="libmanagement_ext">
                 <in>DiagnosticCommandImpl.c</in>
                 <in>Flag.c</in>
                 <in>GarbageCollectorExtImpl.c</in>
                 <in>GcInfoBuilder.c</in>
                 <in>HotSpotDiagnostic.c</in>
                 <in>management_ext.c</in>
-                <in>management_ext.h</in>
-              </df>
-            </df>
-          </df>
-          <df name="solaris">
-            <df name="native">
-              <df name="libmanagement_ext">
-                <in>UnixOperatingSystem.c</in>
               </df>
             </df>
           </df>
           <df name="unix">
             <df name="native">
               <df name="libmanagement_ext">
                 <in>OperatingSystemImpl.c</in>
               </df>
             </df>
           </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libmanagement_ext">
-                <in>OperatingSystemImpl.c</in>
-              </df>
-            </df>
-          </df>
         </df>
         <df name="jdk.management.agent">
           <df name="unix">
             <df name="native">
               <df name="libmanagement_agent">
                 <in>FileSystemImpl.c</in>
               </df>
             </df>
           </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libmanagement_agent">
-                <in>FileSystemImpl.c</in>
-              </df>
-            </df>
-          </df>
         </df>
         <df name="jdk.net">
-          <df name="solaris">
+          <df name="linux">
             <df name="native">
               <df name="libextnet">
-                <in>SolarisSocketOptions.c</in>
-                <in>SolarisSocketOptions.h</in>
+                <in>LinuxSocketOptions.c</in>
               </df>
             </df>
           </df>
         </df>
         <df name="jdk.pack">
           <df name="share">
             <df name="native">
               <df name="common-unpack">
                 <in>bands.cpp</in>
-                <in>bands.h</in>
                 <in>bytes.cpp</in>
-                <in>bytes.h</in>
                 <in>coding.cpp</in>
-                <in>coding.h</in>
-                <in>constants.h</in>
-                <in>defines.h</in>
                 <in>unpack.cpp</in>
-                <in>unpack.h</in>
                 <in>utils.cpp</in>
-                <in>utils.h</in>
                 <in>zip.cpp</in>
-                <in>zip.h</in>
               </df>
               <df name="libunpack">
                 <in>jni.cpp</in>
               </df>
               <df name="unpack200">

@@ -5798,11 +2167,10 @@
         </df>
         <df name="jdk.sctp">
           <df name="unix">
             <df name="native">
               <df name="libsctp">
-                <in>Sctp.h</in>
                 <in>SctpChannelImpl.c</in>
                 <in>SctpNet.c</in>
                 <in>SctpServerChannelImpl.c</in>
               </df>
             </df>

@@ -5814,91 +2182,17 @@
               <df name="libjaas">
                 <in>Unix.c</in>
               </df>
             </df>
           </df>
-          <df name="windows">
-            <df name="native">
-              <df name="libjaas">
-                <in>nt.c</in>
-              </df>
-            </df>
-          </df>
-        </df>
-        <df name="sample">
-          <df name="nashorn">
-            <in>Main.asm</in>
-          </df>
-        </df>
-        <df name="utils">
-          <df name="hsdis">
-            <in>hsdis-demo.c</in>
-            <in>hsdis.c</in>
-            <in>hsdis.h</in>
-          </df>
-          <df name="reorder">
-            <df name="tools">
-              <in>mcount.c</in>
-              <in>remove_mcount.c</in>
-              <in>util-i586.il</in>
-              <in>util-sparc.il</in>
-              <in>util-sparcv9.il</in>
-            </df>
-          </df>
         </df>
       </df>
       <df name="test">
-        <df name="failure_handler">
-          <df name="src">
-            <df name="windows">
-              <df name="native">
-                <df name="libtimeoutHandler">
-                  <in>GatherProcessInfoTimeoutHandler.c</in>
-                </df>
-              </df>
-            </df>
-          </df>
-        </df>
         <df name="fmw">
           <df name="gtest">
-            <df name="include">
-              <df name="gtest">
-                <df name="internal">
-                  <in>gtest-death-test-internal.h</in>
-                  <in>gtest-filepath.h</in>
-                  <in>gtest-internal.h</in>
-                  <in>gtest-linked_ptr.h</in>
-                  <in>gtest-param-util-generated.h</in>
-                  <in>gtest-param-util.h</in>
-                  <in>gtest-port.h</in>
-                  <in>gtest-string.h</in>
-                  <in>gtest-tuple.h</in>
-                  <in>gtest-type-util.h</in>
-                </df>
-                <in>gtest-death-test.h</in>
-                <in>gtest-message.h</in>
-                <in>gtest-param-test.h</in>
-                <in>gtest-printers.h</in>
-                <in>gtest-spi.h</in>
-                <in>gtest-test-part.h</in>
-                <in>gtest-typed-test.h</in>
-                <in>gtest.h</in>
-                <in>gtest_pred_impl.h</in>
-                <in>gtest_prod.h</in>
-              </df>
-            </df>
             <df name="src">
               <in>gtest-all.cc</in>
-              <in>gtest-death-test.cc</in>
-              <in>gtest-filepath.cc</in>
-              <in>gtest-internal-inl.h</in>
-              <in>gtest-port.cc</in>
-              <in>gtest-printers.cc</in>
-              <in>gtest-test-part.cc</in>
-              <in>gtest-typed-test.cc</in>
-              <in>gtest.cc</in>
-              <in>gtest_main.cc</in>
             </df>
           </df>
         </df>
         <df name="hotspot">
           <df name="gtest">

@@ -5906,55 +2200,85 @@
               <in>test_AltHashing.cpp</in>
               <in>test_symbolTable.cpp</in>
             </df>
             <df name="code">
               <in>test_dependencyContext.cpp</in>
+              <in>test_vtableStub.cpp</in>
+            </df>
+            <df name="compiler">
+              <in>test_directivesParser.cpp</in>
             </df>
             <df name="gc">
               <df name="g1">
-                <in>test_bufferingOopClosure.cpp</in>
                 <in>test_freeRegionList.cpp</in>
+                <in>test_g1Analytics.cpp</in>
                 <in>test_g1BiasedArray.cpp</in>
                 <in>test_g1CodeCacheRemSet.cpp</in>
+                <in>test_g1HeapVerifier.cpp</in>
                 <in>test_g1IHOPControl.cpp</in>
                 <in>test_g1Predictions.cpp</in>
+                <in>test_heapRegion.cpp</in>
               </df>
               <df name="parallel">
                 <in>test_psAdaptiveSizePolicy.cpp</in>
                 <in>test_psParallelCompact.cpp</in>
               </df>
               <df name="shared">
                 <in>test_collectedHeap.cpp</in>
                 <in>test_collectorPolicy.cpp</in>
+                <in>test_gcTimer.cpp</in>
                 <in>test_memset_with_concurrent_readers.cpp</in>
+                <in>test_oopStorage.cpp</in>
+                <in>test_oopStorage_parperf.cpp</in>
+                <in>test_preservedMarks.cpp</in>
+                <in>test_ptrQueueBufferAllocator.cpp</in>
                 <in>test_workerDataArray.cpp</in>
               </df>
+              <df name="z">
+                <in>test_zAddress.cpp</in>
+                <in>test_zArray.cpp</in>
+                <in>test_zBitField.cpp</in>
+                <in>test_zBitMap.cpp</in>
+                <in>test_zForwardingTable.cpp</in>
+                <in>test_zList.cpp</in>
+                <in>test_zLiveMap.cpp</in>
+                <in>test_zPhysicalMemory.cpp</in>
+                <in>test_zUtils.cpp</in>
+                <in>test_zVirtualMemory.cpp</in>
+              </df>
+            </df>
+            <df name="jfr">
+              <in>test_networkUtilization.cpp</in>
+              <in>test_threadCpuLoad.cpp</in>
             </df>
             <df name="logging">
               <in>logTestFixture.cpp</in>
-              <in>logTestFixture.hpp</in>
-              <in>logTestUtils.inline.hpp</in>
               <in>test_gcTraceTime.cpp</in>
               <in>test_log.cpp</in>
               <in>test_logConfiguration.cpp</in>
               <in>test_logDecorations.cpp</in>
               <in>test_logDecorators.cpp</in>
               <in>test_logFileOutput.cpp</in>
               <in>test_logLevel.cpp</in>
               <in>test_logMessageTest.cpp</in>
               <in>test_logOutputList.cpp</in>
+              <in>test_logSelection.cpp</in>
+              <in>test_logSelectionList.cpp</in>
               <in>test_logStream.cpp</in>
               <in>test_logTag.cpp</in>
-              <in>test_logTagLevelExpression.cpp</in>
               <in>test_logTagSet.cpp</in>
               <in>test_logTagSetDescriptions.cpp</in>
             </df>
             <df name="memory">
               <in>test_chunkManager.cpp</in>
               <in>test_guardedMemory.cpp</in>
               <in>test_metachunk.cpp</in>
+              <in>test_metaspace.cpp</in>
+              <in>test_metaspace_allocation.cpp</in>
               <in>test_spaceManager.cpp</in>
+              <in>test_virtualSpaceNode.cpp</in>
+              <in>test_virtualspace.cpp</in>
             </df>
             <df name="metaprogramming">
               <in>test_conditional.cpp</in>
               <in>test_decay.cpp</in>
               <in>test_enableIf.cpp</in>

@@ -5972,742 +2296,56 @@
               <in>test_removeReference.cpp</in>
             </df>
             <df name="oops">
               <in>test_arrayOop.cpp</in>
               <in>test_instanceKlass.cpp</in>
+              <in>test_oop.cpp</in>
+              <in>test_typeArrayOop.cpp</in>
+            </df>
+            <df name="opto">
+              <in>test_mathexact.cpp</in>
             </df>
             <df name="runtime">
               <in>test_arguments.cpp</in>
               <in>test_classLoader.cpp</in>
+              <in>test_committed_virtualmemory.cpp</in>
               <in>test_globals.cpp</in>
+              <in>test_objectMonitor.cpp</in>
               <in>test_os.cpp</in>
+              <in>test_os_linux.cpp</in>
+              <in>test_os_windows.cpp</in>
+              <in>test_perfdata.cpp</in>
               <in>test_semaphore.cpp</in>
+              <in>test_synchronizer.cpp</in>
+              <in>test_virtualMemoryTracker.cpp</in>
               <in>test_vmStructs.cpp</in>
             </df>
             <df name="utilities">
               <in>test_align.cpp</in>
               <in>test_bitMap.cpp</in>
+              <in>test_bitMap_large.cpp</in>
               <in>test_bitMap_search.cpp</in>
               <in>test_bitMap_setops.cpp</in>
               <in>test_chunkedList.cpp</in>
+              <in>test_concurrentHashtable.cpp</in>
               <in>test_count_trailing_zeros.cpp</in>
+              <in>test_globalCounter.cpp</in>
+              <in>test_globalCounter_nested.cpp</in>
               <in>test_globalDefinitions.cpp</in>
               <in>test_json.cpp</in>
               <in>test_linkedlist.cpp</in>
               <in>test_quicksort.cpp</in>
               <in>test_resourceHash.cpp</in>
+              <in>test_singleWriterSynchronizer.cpp</in>
+              <in>test_spinYield.cpp</in>
+              <in>test_stringUtils.cpp</in>
               <in>test_utf8.cpp</in>
             </df>
             <in>gtestLauncher.cpp</in>
             <in>gtestMain.cpp</in>
-            <in>unittest.hpp</in>
-          </df>
-          <df name="jtreg">
-            <df name="compiler">
-              <df name="aot">
-                <df name="scripts">
-                  <in>java.base-list.txt</in>
-                  <in>jdk.internal.vm.compiler-list.txt</in>
-                  <in>jdk.scripting.nashorn-list.txt</in>
-                </df>
-              </df>
-              <df name="c2">
-                <df name="cr6890943">
-                  <in>input6890943.txt</in>
-                  <in>output6890943.txt</in>
-                </df>
-              </df>
-              <df name="calls">
-                <df name="common">
-                  <in>libCallsNative.c</in>
-                </df>
-                <in>libTestDirtyInt.c</in>
-              </df>
-              <df name="compilercontrol">
-                <in>control_off.txt</in>
-                <in>control_on.txt</in>
-              </df>
-              <df name="floatingpoint">
-                <in>libTestFloatJNIArgs.c</in>
-              </df>
-              <df name="jvmci">
-                <df name="jdk.vm.ci.code.test">
-                  <in>libNativeCallTest.c</in>
-                </df>
-              </df>
-              <df name="oracle">
-                <in>command1.txt</in>
-                <in>command2.txt</in>
-              </df>
-            </df>
-            <df name="gc">
-              <df name="cslocker">
-                <in>libTestCSLocker.c</in>
-              </df>
-              <df name="g1">
-                <df name="TestJNIWeakG1">
-                  <in>libTestJNIWeakG1.c</in>
-                </df>
-              </df>
-              <df name="stress">
-                <df name="gclocker">
-                  <in>libTestGCLocker.c</in>
-                </df>
-              </df>
-            </df>
-            <df name="native_sanity">
-              <in>libJniVersion.c</in>
-            </df>
-            <df name="runtime">
-              <df name="BoolReturn">
-                <in>libNativeSmallIntCalls.c</in>
-              </df>
-              <df name="CommandLine">
-                <in>flagfile.txt</in>
-              </df>
-              <df name="execstack">
-                <in>libtest-rw.c</in>
-                <in>libtest-rwx.c</in>
-              </df>
-              <df name="jni">
-                <df name="8025979">
-                  <in>libUninitializedStrings.c</in>
-                </df>
-                <df name="8033445">
-                  <in>libDefaultMethods.c</in>
-                </df>
-                <df name="CalleeSavedRegisters">
-                  <in>exeFPRegs.c</in>
-                </df>
-                <df name="CallWithJNIWeak">
-                  <in>libCallWithJNIWeak.c</in>
-                </df>
-                <df name="checked">
-                  <in>libTestCheckedJniExceptionCheck.c</in>
-                </df>
-                <df name="PrivateInterfaceMethods">
-                  <in>libPrivateInterfaceMethods.c</in>
-                </df>
-                <df name="ReturnJNIWeak">
-                  <in>libReturnJNIWeak.c</in>
-                </df>
-                <df name="ToStringInInterfaceTest">
-                  <in>libToStringTest.c</in>
-                </df>
-              </df>
-              <df name="jsig">
-                <in>libTestJNI.c</in>
-              </df>
-              <df name="libadimalloc.solaris.sparc">
-                <in>liboverflow.c</in>
-              </df>
-              <df name="modules">
-                <df name="getModuleJNI">
-                  <in>libGetModule.c</in>
-                </df>
-              </df>
-              <df name="noClassDefFoundMsg">
-                <in>libNoClassDefFoundMsg.c</in>
-              </df>
-              <df name="RedefineTests">
-                <in>libRedefineDoubleDelete.c</in>
-              </df>
-              <df name="SameObject">
-                <in>libSameObject.c</in>
-              </df>
-              <df name="StackGuardPages">
-                <in>exeinvoke.c</in>
-              </df>
-              <df name="ThreadSignalMask">
-                <in>exeThreadSignalMask.c</in>
-              </df>
-            </df>
-            <df name="serviceability">
-              <df name="dcmd">
-                <df name="compiler">
-                  <in>control1.txt</in>
-                  <in>control2.txt</in>
-                </df>
-              </df>
-              <df name="jvmti">
-                <df name="AddModuleExportsAndOpens">
-                  <in>libAddModuleExportsAndOpensTest.c</in>
-                </df>
-                <df name="AddModuleReads">
-                  <in>libAddModuleReadsTest.c</in>
-                </df>
-                <df name="AddModuleUsesAndProvides">
-                  <in>libAddModuleUsesAndProvidesTest.c</in>
-                </df>
-                <df name="GetModulesInfo">
-                  <in>libJvmtiGetAllModulesTest.c</in>
-                </df>
-                <df name="GetNamedModule">
-                  <in>libGetNamedModuleTest.c</in>
-                </df>
-                <df name="GetOwnedMonitorInfo">
-                  <in>libGetOwnedMonitorInfoTest.c</in>
-                </df>
-                <df name="IsModifiableModule">
-                  <in>libIsModifiableModuleTest.c</in>
-                </df>
-                <df name="HeapMonitorModule">
-                  <in>libHeapMonitorTest.c</in>
-                </df>
-                <df name="VMEvent">
-                  <in>libVMEventTest.c</in>
-                </df>
-                <df name="ModuleAwareAgents">
-                  <df name="ClassFileLoadHook">
-                    <in>libMAAClassFileLoadHook.c</in>
-                  </df>
-                  <df name="ClassLoadPrepare">
-                    <in>libMAAClassLoadPrepare.c</in>
-                  </df>
-                  <df name="ThreadStart">
-                    <in>libMAAThreadStart.c</in>
-                  </df>
-                </df>
-                <df name="StartPhase">
-                  <df name="AllowedFunctions">
-                    <in>libAllowedFunctions.c</in>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="testlibrary">
-              <df name="jvmti">
-                <in>libSimpleClassFileLoadHook.c</in>
-              </df>
-            </df>
-            <in>ProblemList.txt</in>
-          </df>
-        </df>
-        <df name="jaxp">
-          <df name="javax">
-            <df name="xml">
-              <df name="jaxp">
-                <df name="functional">
-                  <df name="test">
-                    <df name="gaptest">
-                      <df name="xmlfiles">
-                        <df name="out">
-                          <in>Bug4858685.txt</in>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-                <df name="unittest">
-                  <df name="common">
-                    <df name="prettyprint">
-                      <in>nodetest1.txt</in>
-                    </df>
-                  </df>
-                  <df name="stream">
-                    <df name="XMLEventWriterTest">
-                      <in>replace1.txt</in>
-                    </df>
-                    <df name="XMLResolverTest">
-                      <in>replace1.txt</in>
-                      <in>replace2.txt</in>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-          <in>ProblemList.txt</in>
-        </df>
-        <df name="jdk">
-          <df name="com">
-            <df name="sun">
-              <df name="crypto">
-                <df name="provider">
-                  <df name="Cipher">
-                    <df name="DES">
-                      <df name="inputData">
-                        <in>plain0.txt</in>
-                        <in>plain1.txt</in>
-                        <in>plain10.txt</in>
-                        <in>plain2.txt</in>
-                        <in>plain3.txt</in>
-                        <in>plain4.txt</in>
-                        <in>plain5.txt</in>
-                        <in>plain6.txt</in>
-                        <in>plain7.txt</in>
-                        <in>plain8.txt</in>
-                        <in>plain9.txt</in>
-                      </df>
-                    </df>
-                    <df name="RSA">
-                      <in>oaep-vect.txt</in>
-                    </df>
-                  </df>
-                  <df name="TLS">
-                    <in>keymatdata.txt</in>
-                    <in>masterdata.txt</in>
-                    <in>prf12data.txt</in>
-                    <in>prfdata.txt</in>
-                  </df>
-                </df>
-              </df>
-              <df name="net">
-                <df name="httpserver">
-                  <df name="docs">
-                    <df name="test1">
-                      <in>largefile.txt</in>
-                      <in>smallfile.txt</in>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-          <df name="java">
-            <df name="awt">
-              <df name="JAWT">
-                <in>myfile.c</in>
-                <in>myfile.cpp</in>
-              </df>
-            </df>
-            <df name="io">
-              <df name="LineNumberReader">
-                <in>SkipInput.txt</in>
-              </df>
-              <df name="RandomAccessFile">
-                <df name="skipBytes">
-                  <in>input.txt</in>
                 </df>
               </df>
-              <df name="readBytes">
-                <in>input.txt</in>
-              </df>
-              <df name="Reader">
-                <in>SkipInput.txt</in>
-              </df>
-              <df name="StreamTokenizer">
-                <in>input.txt</in>
-              </df>
-            </df>
-            <df name="lang">
-              <df name="Character">
-                <in>PropList.txt</in>
-                <in>PropertyValueAliases.txt</in>
-                <in>Scripts.txt</in>
-              </df>
-              <df name="String">
-                <df name="nativeEncoding">
-                  <in>libstringPlatformChars.c</in>
-                </df>
-              </df>
-              <df name="StringCoding">
-                <in>locales.txt</in>
-              </df>
-            </df>
-            <df name="net">
-              <df name="httpclient">
-                <df name="docs">
-                  <df name="files">
-                    <in>foo.txt</in>
-                    <in>notsobigfile.txt</in>
-                    <in>smallfile.txt</in>
-                  </df>
-                </df>
-              </df>
-              <df name="Inet6Address">
-                <df name="serialize">
-                  <in>Readme.txt</in>
-                </df>
-              </df>
-            </df>
-            <df name="nio">
-              <df name="channels">
-                <df name="spi">
-                  <df name="SelectorProvider">
-                    <df name="inheritedChannel">
-                      <in>Launcher.c</in>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="text">
-              <df name="BreakIterator">
-                <in>broken_th_TH.txt</in>
-                <in>test_th_TH.txt</in>
-              </df>
-              <df name="Format">
-                <df name="ChoiceFormat">
-                  <in>Bug4185732.ser.txt</in>
-                </df>
-                <df name="common">
-                  <in>ChoiceFormat.ser.txt</in>
-                  <in>DateFormat.Field.ser.txt</in>
-                  <in>MessageFormat.Field.ser.txt</in>
-                  <in>NumberFormat.Field.ser.txt</in>
-                </df>
-                <df name="DateFormat">
-                  <in>SDFserialized.ser.txt</in>
-                </df>
-                <df name="MessageFormat">
-                  <in>Bug4185816.ser.txt</in>
-                  <in>Bug4185816Corrupt.ser.txt</in>
-                </df>
-                <df name="NumberFormat">
-                  <in>DecimalFormat.114.txt</in>
-                  <in>DecimalFormatSymbols.114.txt</in>
-                  <in>DecimalFormatSymbols.142.txt</in>
-                  <in>NumberFormat4185761a.ser.txt</in>
-                  <in>NumberFormat4185761b.ser.txt</in>
-                </df>
-              </df>
-            </df>
-            <df name="util">
-              <df name="Base64">
-                <in>baseEncode.txt</in>
-                <in>mimeEncode.txt</in>
-                <in>plain.txt</in>
-                <in>urlEncode.txt</in>
-              </df>
-              <df name="Currency">
-                <in>tablea1.txt</in>
-              </df>
-              <df name="Locale">
-                <df name="data">
-                  <in>deflocale.c</in>
-                </df>
-                <in>icuLocales.txt</in>
-              </df>
-              <df name="Properties">
-                <df name="invalidxml">
-                  <in>README.txt</in>
-                </df>
-              </df>
-              <df name="regex">
-                <in>BMPTestCases.txt</in>
-                <in>GraphemeBreakProperty.txt</in>
-                <in>GraphemeBreakTest.txt</in>
-                <in>SupplementaryTestCases.txt</in>
-                <in>TestCases.txt</in>
-              </df>
-              <df name="Scanner">
-                <in>input.txt</in>
-              </df>
-            </df>
-          </df>
-          <df name="javax">
-            <df name="crypto">
-              <df name="Cipher">
-                <df name="ExampleVectors">
-                  <in>NIST_800_38A_vectors.txt</in>
-                </df>
-              </df>
-              <df name="CryptoPermissions">
-                <in>README.txt</in>
-              </df>
-            </df>
-            <df name="management">
-              <df name="loading">
-                <df name="LibraryLoader">
-                  <df name="jar_src">
-                    <in>RandomGen.c</in>
-                    <in>RandomGen.h</in>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="print">
-              <df name="attribute">
-                <df name="autosense">
-                  <in>sample.txt</in>
-                </df>
-              </df>
-            </df>
-            <df name="swing">
-              <df name="JTextArea">
-                <df name="4697612">
-                  <in>bug4697612.txt</in>
-                </df>
-              </df>
-              <df name="LookAndFeel">
-                <df name="8145547">
-                  <in>DemandGTK2.txt</in>
-                </df>
-              </df>
-              <df name="text">
-                <df name="View">
-                  <df name="8015853">
-                    <in>bug8015853.txt</in>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-          <df name="jdk">
-            <df name="nio">
-              <df name="zipfs">
-                <df name="jarfs">
-                  <df name="root">
-                    <df name="dir1">
-                      <in>leaf1.txt</in>
-                      <in>leaf2.txt</in>
-                    </df>
-                    <df name="dir2">
-                      <in>leaf3.txt</in>
-                      <in>leaf4.txt</in>
-                    </df>
-                  </df>
-                  <df name="v9">
-                    <df name="root">
-                      <df name="dir1">
-                        <in>leaf1.txt</in>
-                        <in>leaf2.txt</in>
-                      </df>
-                      <df name="dir2">
-                        <in>leaf3.txt</in>
-                        <in>leaf4.txt</in>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-          <df name="native_sanity">
-            <df name="simplenativelauncher">
-              <in>exesanity_SimpleNativeLauncher.c</in>
-            </df>
-            <df name="simplenativelib">
-              <in>libsanity_SimpleNativeLib.c</in>
-            </df>
-            <df name="simplenativelib2">
-              <in>libsanity_SimpleNativeLib2.c</in>
-            </df>
-          </df>
-          <df name="sanity">
-            <df name="client">
-              <df name="lib">
-                <df name="SwingSet3">
-                  <df name="src">
-                    <df name="com">
-                      <df name="sun">
-                        <df name="swingset3">
-                          <df name="demos">
-                            <df name="tree">
-                              <df name="resources">
-                                <in>tree.txt</in>
-                              </df>
-                            </df>
-                          </df>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-          <df name="sun">
-            <df name="management">
-              <df name="jmxremote">
-                <df name="bootstrap">
-                  <df name="ssl">
-                    <in>Readme.txt</in>
-                  </df>
-                  <in>launcher.c</in>
-                </df>
-                <df name="startstop">
-                  <in>REMOTE_TESTING.txt</in>
-                </df>
-              </df>
-              <df name="windows">
-                <in>revokeall.c</in>
-              </df>
-            </df>
-            <df name="net">
-              <df name="www">
-                <df name="protocol">
-                  <df name="jar">
-                    <df name="jarbug">
-                      <df name="etc">
-                        <df name="jar1">
-                          <in>res1.txt</in>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="security">
-              <df name="ec">
-                <in>p12passwords.txt</in>
-              </df>
-              <df name="jgss">
-                <df name="spnego">
-                  <in>msoid.txt</in>
-                </df>
-              </df>
-              <df name="pkcs11">
-                <df name="ec">
-                  <in>p12passwords.txt</in>
-                </df>
-                <df name="KeyStore">
-                  <df name="BasicData">
-                    <in>p11-activcard.txt</in>
-                    <in>p11-ibutton.txt</in>
-                    <in>p11-nss.txt</in>
-                    <in>p11-sca1000.txt</in>
-                    <in>p11-solaris.txt</in>
-                  </df>
-                  <df name="ClientAuthData">
-                    <in>p11-nss.txt</in>
-                  </df>
-                </df>
-                <df name="nss">
-                  <in>p11-deimos.txt</in>
-                  <in>p11-nss.txt</in>
-                </df>
-                <df name="Provider">
-                  <in>ConfigQuotedString-nss.txt</in>
-                  <in>Login-nss.txt</in>
-                </df>
-                <df name="tls">
-                  <in>keymatdata.txt</in>
-                  <in>masterdata.txt</in>
-                  <in>prfdata.txt</in>
-                </df>
-              </df>
-              <df name="smartcardio">
-                <in>README.txt</in>
-              </df>
-              <df name="tools">
-                <df name="keytool">
-                  <in>p11-nss.txt</in>
-                </df>
-              </df>
-            </df>
-            <df name="tools">
-              <df name="jcmd">
-                <in>dcmd-big-script.txt</in>
-                <in>dcmd-script.txt</in>
-              </df>
-            </df>
-          </df>
-          <df name="tools">
-            <df name="jar">
-              <df name="multiRelease">
-                <df name="data">
-                  <df name="runtimetest">
-                    <in>manifest.txt</in>
-                  </df>
-                </df>
-              </df>
-            </df>
-            <df name="pack200">
-              <df name="typeannos">
-                <in>Readme.txt</in>
-              </df>
-            </df>
-          </df>
-          <in>ProblemList.txt</in>
-        </df>
-        <df name="langtools">
-          <df name="jdk">
-            <df name="javadoc">
-              <df name="doclet">
-                <df name="testDocFileDir">
-                  <df name="pkg">
-                    <df name="doc-files">
-                      <df name="subdir-excluded1">
-                        <in>testfile.txt</in>
-                      </df>
-                      <df name="subdir-excluded2">
-                        <in>testfile.txt</in>
-                      </df>
-                      <df name="subdir-used1">
-                        <in>testfile.txt</in>
-                      </df>
-                      <df name="subdir-used2">
-                        <in>testfile.txt</in>
-                      </df>
-                      <in>testfile.txt</in>
-                    </df>
-                  </df>
-                </df>
-                <df name="testDocFiles">
-                  <df name="pkg">
-                    <df name="doc-files">
-                      <in>test.txt</in>
-                    </df>
-                  </df>
-                </df>
-              </df>
-              <df name="tool">
-                <df name="sampleapi">
-                  <in>README.txt</in>
-                </df>
-              </df>
-            </df>
-          </df>
-          <df name="tools">
-            <df name="doclint">
-              <df name="tidy">
-                <in>README.txt</in>
-              </df>
-            </df>
-            <df name="javac">
-              <df name="classfiles">
-                <df name="attributes">
-                  <df name="annotations">
-                    <in>README.txt</in>
-                  </df>
-                  <df name="innerclasses">
-                    <in>README.txt</in>
-                  </df>
-                </df>
-              </df>
-              <df name="diags">
-                <in>README.examples.txt</in>
-                <in>examples.not-yet.txt</in>
-              </df>
-            </df>
-            <df name="jdeprscan">
-              <df name="tests">
-                <df name="jdk">
-                  <df name="jdeprscan">
-                    <in>TestScanExpected.txt</in>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-          <in>ProblemList.txt</in>
-        </df>
-        <df name="nashorn">
-          <df name="src">
-            <df name="jdk">
-              <df name="nashorn">
-                <df name="internal">
-                  <df name="runtime">
-                    <df name="doubleconv">
-                      <df name="test">
-                        <df name="resources">
-                          <in>gay-fixed.txt</in>
-                          <in>gay-precision.txt</in>
-                          <in>gay-shortest.txt</in>
-                        </df>
-                      </df>
-                    </df>
-                  </df>
-                </df>
-              </df>
-            </df>
-          </df>
-          <in>ProblemList.txt</in>
-        </df>
       </df>
     </df>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
                    projectFiles="false"

@@ -6725,12 +2363,49 @@
       <toolsSet>
         <compilerSet>default</compilerSet>
         <dependencyChecking>false</dependencyChecking>
         <rebuildPropChanged>false</rebuildPropChanged>
       </toolsSet>
+      <codeAssistance>
+        <transientMacros>
+          <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+          <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+          <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+        </transientMacros>
+      </codeAssistance>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>../..</buildCommandWorkingDir>
+          <buildCommand>${MAKE} -f Makefile images</buildCommand>
+          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
+          <executablePath></executablePath>
+          <cTool>
+            <preprocessorList>
+              <Elem>THIS_FILE="MacosxDebuggerLocal.m"</Elem>
+            </preprocessorList>
+          </cTool>
+        </makeTool>
+        <preBuild>
+          <preBuildCommandWorkingDir>../..</preBuildCommandWorkingDir>
+          <preBuildCommand>sh configure --with-debug-level=slowdebug</preBuildCommand>
+        </preBuild>
+      </makefileType>
+    </conf>
+    <conf name="Linux_64" type="0">
+      <toolsSet>
+        <compilerSet>default</compilerSet>
+        <dependencyChecking>false</dependencyChecking>
+        <rebuildPropChanged>false</rebuildPropChanged>
+      </toolsSet>
       <flagsDictionary>
-        <element flagsID="0" commonFlags="-m64 -fPIC -fno-rtti -fno-exceptions"/>
+        <element flagsID="0" commonFlags="-fno-exceptions -std=gnu++98"/>
+        <element flagsID="1"
+                 commonFlags="-fno-rtti -fno-exceptions -std=gnu++98 -fPIC -m64 -m64"/>
+        <element flagsID="2" commonFlags="-fstack-protector-all -g -m64 -fPIC -g"/>
+        <element flagsID="3" commonFlags="-fstack-protector-all -g -m64 -g"/>
+        <element flagsID="4"
+                 commonFlags="-fstack-protector-all -std=gnu++98 -m64 -fPIC"/>
       </flagsDictionary>
       <codeAssistance>
         <transientMacros>
           <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
           <Elem>HOTSPOT_BUILD_USER="user"</Elem>

@@ -6742,34094 +2417,21510 @@
           <buildCommandWorkingDir>../..</buildCommandWorkingDir>
           <buildCommand>${MAKE} -f Makefile images</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath></executablePath>
           <cTool>
+            <incDir>
+              <pElem>../../build/linux-x86_64-server-slowdebug/support/modules_include/java.base</pElem>
+              <pElem>../../build/linux-x86_64-server-slowdebug/support/modules_include/java.base/linux</pElem>
+              <pElem>../../src/java.base/share/native/libjava</pElem>
+              <pElem>../../src/java.base/unix/native/libjava</pElem>
+              <pElem>../../src/hotspot/share/include</pElem>
+              <pElem>../../src/hotspot/os/posix/include</pElem>
+            </incDir>
             <preprocessorList>
-              <Elem>THIS_FILE="MacosxDebuggerLocal.m"</Elem>
+              <Elem>ARCH="amd64"</Elem>
+              <Elem>LINUX</Elem>
+              <Elem>THIS_FILE="ProcessHandleImpl_linux.c"</Elem>
+              <Elem>_GNU_SOURCE</Elem>
+              <Elem>_LARGEFILE64_SOURCE</Elem>
+              <Elem>_LITTLE_ENDIAN</Elem>
+              <Elem>_LP64=1</Elem>
+              <Elem>_REENTRANT</Elem>
+              <Elem>amd64</Elem>
             </preprocessorList>
           </cTool>
+          <ccTool>
+            <preprocessorList>
+              <Elem>LINUX</Elem>
+              <Elem>THIS_FILE="ad_x86.cpp"</Elem>
+            </preprocessorList>
+          </ccTool>
         </makeTool>
         <preBuild>
           <preBuildCommandWorkingDir>../..</preBuildCommandWorkingDir>
-          <preBuildCommand>sh ../configure --with-debug-level=slowdebug --disable-zip-debug-info</preBuildCommand>
+          <preBuildCommand>sh configure --with-debug-level=slowdebug</preBuildCommand>
         </preBuild>
       </makefileType>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64_clone.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86_clone.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="ad_x86_64_clone.cpp"</Elem>
+            <Elem>THIS_FILE="ad_x86_clone.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64_expand.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86_expand.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="ad_x86_64_expand.cpp"</Elem>
+            <Elem>THIS_FILE="ad_x86_expand.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64_format.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86_format.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="ad_x86_64_format.cpp"</Elem>
+            <Elem>THIS_FILE="ad_x86_format.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64_gen.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86_gen.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="ad_x86_64_gen.cpp"</Elem>
+            <Elem>THIS_FILE="ad_x86_gen.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64_misc.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86_misc.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="ad_x86_64_misc.cpp"</Elem>
+            <Elem>THIS_FILE="ad_x86_misc.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64_peephole.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86_peephole.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="ad_x86_64_peephole.cpp"</Elem>
+            <Elem>THIS_FILE="ad_x86_peephole.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/ad_x86_64_pipeline.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/ad_x86_pipeline.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="ad_x86_64_pipeline.cpp"</Elem>
+            <Elem>THIS_FILE="ad_x86_pipeline.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/adfiles/dfa_x86_64.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/adfiles/dfa_x86.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
-            <Elem>THIS_FILE="dfa_x86_64.cpp"</Elem>
+            <Elem>THIS_FILE="dfa_x86.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/jvmtifiles/jvmtiEnter.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/jvmtifiles/jvmtiEnter.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
             <Elem>THIS_FILE="jvmtiEnter.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/hotspot/variant-server/gensrc/jvmtifiles/jvmtiEnterTrace.cpp"
+      <item path="../../build/linux-x86_64-server-slowdebug/hotspot/variant-server/gensrc/jvmtifiles/jvmtiEnterTrace.cpp"
             ex="false"
             tool="1"
-            flavor2="4">
-        <ccTool flags="0">
+            flavor2="0">
+        <ccTool flags="1">
           <preprocessorList>
             <Elem>THIS_FILE="jvmtiEnterTrace.cpp"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64.cpp"
+      <item path="../../src/hotspot/cpu/x86/abstractInterpreter_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jfrfiles</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/src/os/bsd/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/bsd_x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="abstractInterpreter_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64_clone.cpp"
+      <item path="../../src/hotspot/cpu/x86/assembler_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="assembler_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64_expand.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_CodeStubs_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64_format.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/make</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_FpuStackSim_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64_gen.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_FrameMap_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_FrameMap_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64_misc.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LIRAssembler_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64_peephole.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LIRGenerator_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/ad_x86_64_pipeline.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_LIR_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LIR_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles/dfa_x86_64.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_LinearScan_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/memory</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/adfiles</pElem>
-            <pElem>../../hotspot/make</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/share/vm/opto</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/share/vm/ci</pElem>
-            <pElem>../../hotspot/src/share/vm/compiler</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/share/vm/libadt</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LinearScan_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../hotspot/make</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_MacroAssembler_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles/jvmtiEnter.cpp"
+      <item path="../../src/hotspot/cpu/x86/c1_Runtime1_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../hotspot/src/os/bsd/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/bsd_x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-            <pElem>../../hotspot/make</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Runtime1_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles/jvmtiEnterTrace.cpp"
+      <item path="../../src/hotspot/cpu/x86/c2_init_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
-        <ccTool>
-          <incDir>
-            <pElem>../../hotspot/src/share/vm/prims</pElem>
-            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/oops</pElem>
-            <pElem>../../hotspot/src/share/vm/runtime</pElem>
-            <pElem>../../hotspot/src/share/vm/trace</pElem>
-            <pElem>../../hotspot/src/share/vm/utilities</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/tracefiles</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc/jvmtifiles</pElem>
-            <pElem>/usr/include/c++/4.2.1</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/parallel</pElem>
-            <pElem>../../hotspot/src/share/vm/gc/shared</pElem>
-            <pElem>../../hotspot/src/share/vm/classfile</pElem>
-            <pElem>../../hotspot/src/share/vm/logging</pElem>
-            <pElem>../../hotspot/src/os/bsd/vm</pElem>
-            <pElem>../../hotspot/src/share/vm/code</pElem>
-            <pElem>../../hotspot/src/share/vm/asm</pElem>
-            <pElem>../../hotspot/src/share/vm/interpreter</pElem>
-            <pElem>../../hotspot/src/os/posix/vm</pElem>
-            <pElem>../../hotspot/src/os_cpu/bsd_x86/vm</pElem>
-            <pElem>../../hotspot/src/share/vm</pElem>
-            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/variant-server/gensrc</pElem>
-            <pElem>../../hotspot/make</pElem>
-          </incDir>
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c2_init_x86.cpp"</Elem>
+          </preprocessorList>
         </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/abstractInterpreter_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/compiledIC_aot_x86_64.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledIC_aot_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/assembler_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/compiledIC_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledIC_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/assembler_x86.hpp"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="../../src/hotspot/cpu/x86/assembler_x86.inline.hpp"
+      <item path="../../src/hotspot/cpu/x86/depChecker_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="depChecker_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/bytes_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/frame_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="frame_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_Defs_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/gc/shared/barrierSetNMethod_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="barrierSetNMethod_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cardTableBarrierSetAssembler_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_FrameMap_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="modRefBarrierSetAssembler_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_FrameMap_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahBarrierSetC1_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/icBuffer_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="icBuffer_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_LIR_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/icache_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="icache_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_LinearScan_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/interp_masm_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="interp_masm_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_LinearScan_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/interpreterRT_x86_64.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="interpreterRT_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jniFastGetField_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciCodeInstaller_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_Runtime1_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c1_globals_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_aes.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_aes.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c2_globals_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_cos.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/c2_init_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_exp.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/codeBuffer_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_log.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_log.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/compiledIC_aot_x86_64.cpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_log10.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/compiledIC_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_pow.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_pow.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/copy_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_sha.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/crc32c.h" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="../../src/hotspot/cpu/x86/depChecker_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_sin.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/depChecker_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="macroAssembler_x86_tan.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/disassembler_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/methodHandles_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="methodHandles_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/frame_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/nativeInst_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="nativeInst_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/frame_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/rdtsc_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="rdtsc_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/frame_x86.inline.hpp"
+      <item path="../../src/hotspot/cpu/x86/registerMap_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="registerMap_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/globalDefinitions_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/register_definitions_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="register_definitions_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/globals_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/register_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="register_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/icBuffer_x86.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-      </item>
-      <item path="../../src/hotspot/cpu/x86/icache_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/relocInfo_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="relocInfo_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/icache_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/runtime_x86_64.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="runtime_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/interp_masm_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/sharedRuntime_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="sharedRuntime_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/interp_masm_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="sharedRuntime_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/interpreterRT_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/stubGenerator_x86_64.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stubGenerator_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/interpreterRT_x86_32.cpp"
+      <item path="../../src/hotspot/cpu/x86/stubRoutines_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stubRoutines_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/interpreterRT_x86_64.cpp"
+      <item path="../../src/hotspot/cpu/x86/stubRoutines_x86_64.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stubRoutines_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="templateInterpreterGenerator_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp"
+      <item path="../../src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="templateInterpreterGenerator_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp"
+      <item path="../../src/hotspot/cpu/x86/templateTable_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="templateTable_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/jniTypes_x86.hpp"
+      <item path="../../src/hotspot/cpu/x86/vm_version_ext_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vm_version_ext_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/jni_x86.h"
+      <item path="../../src/hotspot/cpu/x86/vm_version_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vm_version_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/vmreg_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vmreg_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86.cpp"
+      <item path="../../src/hotspot/cpu/x86/vtableStubs_x86_64.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vtableStubs_x86_64.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86.hpp"
+      <item path="../../src/hotspot/os/linux/attachListener_linux.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp"
+      <item path="../../src/hotspot/os/linux/decoder_linux.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="decoder_linux.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp"
+      <item path="../../src/hotspot/os/linux/osContainer_linux.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="osContainer_linux.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp"
+      <item path="../../src/hotspot/os/linux/osThread_linux.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="osThread_linux.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_log.cpp"
+      <item path="../../src/hotspot/os/linux/os_linux.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="os_linux.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp"
+      <item path="../../src/hotspot/os/linux/os_perf_linux.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="os_perf_linux.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_pow.cpp"
+      <item path="../../src/hotspot/os/linux/perfMemory_linux.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="perfMemory_linux.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp"
+      <item path="../../src/hotspot/os/linux/threadCritical_linux.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="threadCritical_linux.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp"
+      <item path="../../src/hotspot/os/posix/jvm_posix.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp"
+      <item path="../../src/hotspot/os/posix/os_posix.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="os_posix.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/methodHandles_x86.cpp"
+      <item path="../../src/hotspot/os/posix/semaphore_posix.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="semaphore_posix.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/methodHandles_x86.hpp"
+      <item path="../../src/hotspot/os/posix/threadLocalStorage_posix.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="threadLocalStorage_posix.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/nativeInst_x86.cpp"
+      <item path="../../src/hotspot/os/posix/vmError_posix.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vmError_posix.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/nativeInst_x86.hpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/assembler_linux_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="assembler_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/registerMap_x86.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zArguments_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/registerMap_x86.hpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zBackingFile_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/register_definitions_x86.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zBackingPath_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/register_x86.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zGlobals_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/register_x86.hpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zLargePages_linux_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zLargePages_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/relocInfo_x86.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zNUMA_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zNUMA_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/relocInfo_x86.hpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zPhysicalMemoryBacking_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/runtime_x86_32.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/gc/z/zVirtualMemory_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zVirtualMemory_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/runtime_x86_64.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="os_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/sharedRuntime_x86.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="thread_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp"
+      <item path="../../src/hotspot/os_cpu/linux_x86/vm_version_linux_x86.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vm_version_linux_x86.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp"
+      <item path="../../src/hotspot/share/adlc/adlparse.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/stubGenerator_x86_32.cpp"
+      <item path="../../src/hotspot/share/adlc/archDesc.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="archDesc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/stubGenerator_x86_64.cpp"
+      <item path="../../src/hotspot/share/adlc/arena.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="arena.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/stubRoutines_x86.cpp"
+      <item path="../../src/hotspot/share/adlc/dfa.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="dfa.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/stubRoutines_x86.hpp"
+      <item path="../../src/hotspot/share/adlc/dict2.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="dict2.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/stubRoutines_x86_32.cpp"
+      <item path="../../src/hotspot/share/adlc/filebuff.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="filebuff.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/stubRoutines_x86_64.cpp"
+      <item path="../../src/hotspot/share/adlc/forms.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="forms.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp"
+      <item path="../../src/hotspot/share/adlc/formsopt.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="formsopt.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/templateInterpreterGenerator_x86_32.cpp"
+      <item path="../../src/hotspot/share/adlc/formssel.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="formssel.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp"
+      <item path="../../src/hotspot/share/adlc/main.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="main.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/templateTable_x86.cpp"
+      <item path="../../src/hotspot/share/adlc/output_c.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="output_c.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/templateTable_x86.hpp"
+      <item path="../../src/hotspot/share/adlc/output_h.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="0">
+          <preprocessorList>
+            <Elem>THIS_FILE="output_h.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/vmStructs_x86.hpp"
+      <item path="../../src/hotspot/share/aot/aotCodeHeap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/vm_version_x86.cpp"
+      <item path="../../src/hotspot/share/aot/aotCompiledMethod.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="aotCompiledMethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/vm_version_x86.hpp"
+      <item path="../../src/hotspot/share/aot/aotLoader.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="aotLoader.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/vmreg_x86.cpp"
+      <item path="../../src/hotspot/share/aot/compiledIC_aot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledIC_aot.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/vmreg_x86.hpp"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="../../src/hotspot/cpu/x86/vmreg_x86.inline.hpp"
+      <item path="../../src/hotspot/share/asm/assembler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/vtableStubs_x86_32.cpp"
+      <item path="../../src/hotspot/share/asm/codeBuffer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="codeBuffer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/vtableStubs_x86_64.cpp"
+      <item path="../../src/hotspot/share/asm/register.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="register.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/x86.ad" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="../../src/hotspot/cpu/x86/x86_32.ad"
+      <item path="../../src/hotspot/share/c1/c1_CFGPrinter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/cpu/x86/x86_64.ad"
+      <item path="../../src/hotspot/share/c1/c1_Canonicalizer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Canonicalizer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/attachListener_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_Compilation.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Compilation.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/c1_globals_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_Compiler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Compiler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/c2_globals_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_Defs.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Defs.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/decoder_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_FrameMap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_FrameMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/decoder_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_GraphBuilder.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_GraphBuilder.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/globals_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_IR.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_IR.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/jvm_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_Instruction.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Instruction.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/jvm_windows.h"
+      <item path="../../src/hotspot/share/c1/c1_InstructionPrinter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_InstructionPrinter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/osThread_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_LIR.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LIR.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/osThread_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_LIRAssembler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LIRAssembler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/os_share_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_LIRGenerator.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LIRGenerator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/os_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_LinearScan.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_LinearScan.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/os_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_Optimizer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Optimizer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/os_windows.inline.hpp"
+      <item path="../../src/hotspot/share/c1/c1_RangeCheckElimination.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_RangeCheckElimination.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/perfMemory_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_Runtime1.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_Runtime1.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/semaphore_windows.hpp"
+      <item path="../../src/hotspot/share/c1/c1_ValueMap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_ValueMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/sharedRuntimeRem.cpp"
+      <item path="../../src/hotspot/share/c1/c1_ValueSet.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_ValueSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/threadCritical_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_ValueStack.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_ValueStack.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/threadLocalStorage_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_ValueType.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_ValueType.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/vmError_windows.cpp"
+      <item path="../../src/hotspot/share/c1/c1_globals.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="c1_globals.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/vmStructs_windows.hpp"
+      <item path="../../src/hotspot/share/ci/bcEscapeAnalyzer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/windbghelp.cpp"
+      <item path="../../src/hotspot/share/ci/ciArray.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciArray.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os/windows/windbghelp.hpp"
+      <item path="../../src/hotspot/share/ci/ciArrayKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciArrayKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/assembler_windows_x86.cpp"
+      <item path="../../src/hotspot/share/ci/ciBaseObject.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciBaseObject.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp"
+      <item path="../../src/hotspot/share/ci/ciCallSite.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciCallSite.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp"
+      <item path="../../src/hotspot/share/ci/ciConstant.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciConstant.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp"
+      <item path="../../src/hotspot/share/ci/ciConstantPoolCache.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciConstantPoolCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp"
+      <item path="../../src/hotspot/share/ci/ciEnv.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciEnv.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.inline.hpp"
+      <item path="../../src/hotspot/share/ci/ciExceptionHandler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciExceptionHandler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp"
+      <item path="../../src/hotspot/share/ci/ciField.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciField.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp"
+      <item path="../../src/hotspot/share/ci/ciFlags.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciFlags.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp"
+      <item path="../../src/hotspot/share/ci/ciInstance.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciInstance.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp"
+      <item path="../../src/hotspot/share/ci/ciInstanceKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciInstanceKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp"
+      <item path="../../src/hotspot/share/ci/ciKlass.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp"
+      <item path="../../src/hotspot/share/ci/ciMemberName.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciMemberName.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp"
+      <item path="../../src/hotspot/share/ci/ciMetadata.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciMetadata.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp"
+      <item path="../../src/hotspot/share/ci/ciMethod.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciMethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/os_cpu/windows_x86/vm_version_windows_x86.cpp"
+      <item path="../../src/hotspot/share/ci/ciMethodBlocks.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciMethodBlocks.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/Test/i486.ad"
+      <item path="../../src/hotspot/share/ci/ciMethodData.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciMethodData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/adlc.hpp"
+      <item path="../../src/hotspot/share/ci/ciMethodHandle.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciMethodHandle.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/adlparse.cpp"
+      <item path="../../src/hotspot/share/ci/ciMethodType.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciMethodType.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/adlparse.hpp"
+      <item path="../../src/hotspot/share/ci/ciNullObject.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciNullObject.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/archDesc.cpp"
+      <item path="../../src/hotspot/share/ci/ciObjArray.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciObjArray.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/archDesc.hpp"
+      <item path="../../src/hotspot/share/ci/ciObjArrayKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciObjArrayKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/arena.cpp"
+      <item path="../../src/hotspot/share/ci/ciObject.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciObject.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/arena.hpp"
+      <item path="../../src/hotspot/share/ci/ciObjectFactory.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciObjectFactory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/dfa.cpp"
+      <item path="../../src/hotspot/share/ci/ciReplay.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciReplay.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/dict2.cpp"
+      <item path="../../src/hotspot/share/ci/ciSignature.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciSignature.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/dict2.hpp"
+      <item path="../../src/hotspot/share/ci/ciStreams.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciStreams.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/filebuff.cpp"
+      <item path="../../src/hotspot/share/ci/ciSymbol.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciSymbol.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/filebuff.hpp"
+      <item path="../../src/hotspot/share/ci/ciType.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciType.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/forms.cpp"
+      <item path="../../src/hotspot/share/ci/ciTypeArray.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciTypeArray.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/forms.hpp"
+      <item path="../../src/hotspot/share/ci/ciTypeArrayKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciTypeArrayKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/formsopt.cpp"
+      <item path="../../src/hotspot/share/ci/ciTypeFlow.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciTypeFlow.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/formsopt.hpp"
+      <item path="../../src/hotspot/share/ci/ciUtilities.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ciUtilities.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/formssel.cpp"
+      <item path="../../src/hotspot/share/classfile/altHashing.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/formssel.hpp"
+      <item path="../../src/hotspot/share/classfile/bytecodeAssembler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bytecodeAssembler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/main.cpp"
+      <item path="../../src/hotspot/share/classfile/classFileError.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classFileError.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/output_c.cpp"
+      <item path="../../src/hotspot/share/classfile/classFileParser.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classFileParser.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/adlc/output_h.cpp"
+      <item path="../../src/hotspot/share/classfile/classFileStream.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classFileStream.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/aotCodeHeap.cpp"
+      <item path="../../src/hotspot/share/classfile/classListParser.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classListParser.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/aotCodeHeap.hpp"
+      <item path="../../src/hotspot/share/classfile/classLoader.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classLoader.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/aotCompiledMethod.cpp"
+      <item path="../../src/hotspot/share/classfile/classLoaderData.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classLoaderData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/aotCompiledMethod.hpp"
+      <item path="../../src/hotspot/share/classfile/classLoaderDataGraph.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classLoaderDataGraph.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/aotLoader.cpp"
+      <item path="../../src/hotspot/share/classfile/classLoaderExt.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classLoaderExt.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/aotLoader.hpp"
+      <item path="../../src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classLoaderHierarchyDCmd.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/aotLoader.inline.hpp"
+      <item path="../../src/hotspot/share/classfile/classLoaderStats.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="classLoaderStats.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/compiledIC_aot.cpp"
+      <item path="../../src/hotspot/share/classfile/compactHashtable.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compactHashtable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/aot/compiledIC_aot.hpp"
+      <item path="../../src/hotspot/share/classfile/defaultMethods.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="defaultMethods.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/assembler.cpp"
+      <item path="../../src/hotspot/share/classfile/dictionary.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="dictionary.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/assembler.hpp"
+      <item path="../../src/hotspot/share/classfile/javaAssertions.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="javaAssertions.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/assembler.inline.hpp"
+      <item path="../../src/hotspot/share/classfile/javaClasses.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="javaClasses.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/codeBuffer.cpp"
+      <item path="../../src/hotspot/share/classfile/klassFactory.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="klassFactory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/codeBuffer.hpp"
+      <item path="../../src/hotspot/share/classfile/loaderConstraints.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="loaderConstraints.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/macroAssembler.hpp"
+      <item path="../../src/hotspot/share/classfile/metadataOnStackMark.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metadataOnStackMark.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/macroAssembler.inline.hpp"
+      <item path="../../src/hotspot/share/classfile/moduleEntry.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="moduleEntry.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/register.cpp"
+      <item path="../../src/hotspot/share/classfile/modules.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="modules.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/asm/register.hpp"
+      <item path="../../src/hotspot/share/classfile/packageEntry.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="packageEntry.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_CFGPrinter.cpp"
+      <item path="../../src/hotspot/share/classfile/placeholders.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="placeholders.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_CFGPrinter.hpp"
+      <item path="../../src/hotspot/share/classfile/protectionDomainCache.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="protectionDomainCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Canonicalizer.cpp"
+      <item path="../../src/hotspot/share/classfile/resolutionErrors.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="resolutionErrors.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Canonicalizer.hpp"
+      <item path="../../src/hotspot/share/classfile/sharedPathsMiscInfo.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="sharedPathsMiscInfo.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_CodeStubs.hpp"
+      <item path="../../src/hotspot/share/classfile/stackMapFrame.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stackMapFrame.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Compilation.cpp"
+      <item path="../../src/hotspot/share/classfile/stackMapTable.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stackMapTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Compilation.hpp"
+      <item path="../../src/hotspot/share/classfile/stringTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stringTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Compiler.cpp"
+      <item path="../../src/hotspot/share/classfile/symbolTable.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="symbolTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Compiler.hpp"
+      <item path="../../src/hotspot/share/classfile/systemDictionary.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="systemDictionary.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Defs.cpp"
+      <item path="../../src/hotspot/share/classfile/systemDictionaryShared.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="systemDictionaryShared.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Defs.hpp"
+      <item path="../../src/hotspot/share/classfile/verificationType.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="verificationType.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_FpuStackSim.hpp"
+      <item path="../../src/hotspot/share/classfile/verifier.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="verifier.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_FrameMap.cpp"
+      <item path="../../src/hotspot/share/classfile/vmSymbols.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vmSymbols.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_FrameMap.hpp"
+      <item path="../../src/hotspot/share/code/codeBehaviours.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_GraphBuilder.cpp"
+      <item path="../../src/hotspot/share/code/codeBlob.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="codeBlob.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_GraphBuilder.hpp"
+      <item path="../../src/hotspot/share/code/codeCache.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="codeCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_IR.cpp"
+      <item path="../../src/hotspot/share/code/codeHeapState.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="codeHeapState.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_IR.hpp"
+      <item path="../../src/hotspot/share/code/compiledIC.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledIC.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Instruction.cpp"
+      <item path="../../src/hotspot/share/code/compiledMethod.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledMethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Instruction.hpp"
+      <item path="../../src/hotspot/share/code/compressedStream.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compressedStream.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_InstructionPrinter.cpp"
+      <item path="../../src/hotspot/share/code/debugInfo.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="debugInfo.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_InstructionPrinter.hpp"
+      <item path="../../src/hotspot/share/code/debugInfoRec.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="debugInfoRec.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LIR.cpp"
+      <item path="../../src/hotspot/share/code/dependencies.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="dependencies.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LIR.hpp"
+      <item path="../../src/hotspot/share/code/dependencyContext.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="dependencyContext.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LIRAssembler.cpp"
+      <item path="../../src/hotspot/share/code/exceptionHandlerTable.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="exceptionHandlerTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LIRAssembler.hpp"
+      <item path="../../src/hotspot/share/code/icBuffer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="icBuffer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LIRGenerator.cpp"
+      <item path="../../src/hotspot/share/code/location.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="location.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LIRGenerator.hpp"
+      <item path="../../src/hotspot/share/code/nmethod.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="nmethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LinearScan.cpp"
+      <item path="../../src/hotspot/share/code/oopRecorder.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="oopRecorder.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_LinearScan.hpp"
+      <item path="../../src/hotspot/share/code/pcDesc.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="pcDesc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_MacroAssembler.hpp"
+      <item path="../../src/hotspot/share/code/relocInfo.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="relocInfo.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Optimizer.cpp"
+      <item path="../../src/hotspot/share/code/relocInfo_ext.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="relocInfo_ext.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Optimizer.hpp"
+      <item path="../../src/hotspot/share/code/scopeDesc.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="scopeDesc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_RangeCheckElimination.cpp"
+      <item path="../../src/hotspot/share/code/stubs.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stubs.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_RangeCheckElimination.hpp"
+      <item path="../../src/hotspot/share/code/vmreg.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vmreg.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Runtime1.cpp"
+      <item path="../../src/hotspot/share/code/vtableStubs.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vtableStubs.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_Runtime1.hpp"
+      <item path="../../src/hotspot/share/compiler/abstractCompiler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueMap.cpp"
+      <item path="../../src/hotspot/share/compiler/compileBroker.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compileBroker.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueMap.hpp"
+      <item path="../../src/hotspot/share/compiler/compileLog.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compileLog.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueSet.cpp"
+      <item path="../../src/hotspot/share/compiler/compileTask.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compileTask.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueSet.hpp"
+      <item path="../../src/hotspot/share/compiler/compilerDefinitions.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compilerDefinitions.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueSet.inline.hpp"
+      <item path="../../src/hotspot/share/compiler/compilerDirectives.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compilerDirectives.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueStack.cpp"
+      <item path="../../src/hotspot/share/compiler/compilerOracle.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compilerOracle.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueStack.hpp"
+      <item path="../../src/hotspot/share/compiler/directivesParser.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="directivesParser.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueType.cpp"
+      <item path="../../src/hotspot/share/compiler/disassembler.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="disassembler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_ValueType.hpp"
+      <item path="../../src/hotspot/share/compiler/methodLiveness.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="methodLiveness.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_globals.cpp"
+      <item path="../../src/hotspot/share/compiler/methodMatcher.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="methodMatcher.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/c1/c1_globals.hpp"
+      <item path="../../src/hotspot/share/compiler/oopMap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="oopMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/bcEscapeAnalyzer.cpp"
+      <item path="../../src/hotspot/share/gc/cms/adaptiveFreeList.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/bcEscapeAnalyzer.hpp"
+      <item path="../../src/hotspot/share/gc/cms/allocationStats.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="allocationStats.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciArray.cpp"
+      <item path="../../src/hotspot/share/gc/cms/cmsArguments.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsArguments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciArray.hpp"
+      <item path="../../src/hotspot/share/gc/cms/cmsCardTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsCardTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciArrayKlass.cpp"
+      <item path="../../src/hotspot/share/gc/cms/cmsCollectorPolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsCollectorPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciArrayKlass.hpp"
+      <item path="../../src/hotspot/share/gc/cms/cmsGCStats.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsGCStats.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciBaseObject.cpp"
+      <item path="../../src/hotspot/share/gc/cms/cmsHeap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciBaseObject.hpp"
+      <item path="../../src/hotspot/share/gc/cms/cmsLockVerifier.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsLockVerifier.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciCallProfile.hpp"
+      <item path="../../src/hotspot/share/gc/cms/cmsVMOperations.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsVMOperations.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciCallSite.cpp"
+      <item path="../../src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compactibleFreeListSpace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciCallSite.hpp"
+      <item path="../../src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="concurrentMarkSweepGeneration.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciClassList.hpp"
+      <item path="../../src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="concurrentMarkSweepThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciConstant.cpp"
+      <item path="../../src/hotspot/share/gc/cms/freeChunk.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="freeChunk.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciConstant.hpp"
+      <item path="../../src/hotspot/share/gc/cms/gSpaceCounters.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gSpaceCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciConstantPoolCache.cpp"
+      <item path="../../src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmFlagConstraintsCMS.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciConstantPoolCache.hpp"
+      <item path="../../src/hotspot/share/gc/cms/parNewGeneration.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="parNewGeneration.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciEnv.cpp"
+      <item path="../../src/hotspot/share/gc/cms/promotionInfo.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="promotionInfo.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciEnv.hpp"
+      <item path="../../src/hotspot/share/gc/cms/yieldingWorkgroup.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="yieldingWorkgroup.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciExceptionHandler.cpp"
+      <item path="../../src/hotspot/share/gc/epsilon/epsilonArguments.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciExceptionHandler.hpp"
+      <item path="../../src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="epsilonBarrierSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciField.cpp"
+      <item path="../../src/hotspot/share/gc/epsilon/epsilonHeap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="epsilonHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciField.hpp"
+      <item path="../../src/hotspot/share/gc/epsilon/epsilonMemoryPool.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="epsilonMemoryPool.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciFlags.cpp"
+      <item path="../../src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="epsilonMonitoringSupport.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciFlags.hpp"
+      <item path="../../src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciInstance.cpp"
+      <item path="../../src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciInstance.hpp"
+      <item path="../../src/hotspot/share/gc/g1/collectionSetChooser.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="collectionSetChooser.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciInstanceKlass.cpp"
+      <item path="../../src/hotspot/share/gc/g1/dirtyCardQueue.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="dirtyCardQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciInstanceKlass.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1AllocRegion.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1AllocRegion.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciKlass.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1Allocator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1Allocator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciKlass.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1Analytics.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1Analytics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMemberName.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1Arguments.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1Arguments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMemberName.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1BarrierSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1BarrierSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMetadata.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1BarrierSetRuntime.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1BarrierSetRuntime.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMetadata.hpp"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="../../src/hotspot/share/ci/ciMethod.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1BiasedArray.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1BiasedArray.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethod.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1BlockOffsetTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethodBlocks.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1CardCounts.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1CardCounts.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethodBlocks.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1CardTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1CardTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethodData.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1CodeBlobClosure.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethodData.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1CodeCacheRemSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethodHandle.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1CollectedHeap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1CollectedHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethodHandle.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1CollectionSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1CollectionSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciMethodType.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1CollectorPolicy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1CollectorPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciNullObject.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMark.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1ConcurrentMark.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciNullObject.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1ConcurrentMarkBitMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObjArray.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1ConcurrentMarkObjArrayProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObjArray.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1ConcurrentMarkThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObjArrayKlass.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1ConcurrentRefine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObjArrayKlass.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1ConcurrentRefineThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObject.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1EvacFailure.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1EvacFailure.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObject.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1EvacStats.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1EvacStats.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObjectFactory.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FromCardCache.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FromCardCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciObjectFactory.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullCollector.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullCollector.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciReplay.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCAdjustTask.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciReplay.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCCompactTask.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciSignature.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCCompactionPoint.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciSignature.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCMarkTask.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciStreams.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCMarker.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCMarker.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciStreams.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCOopClosures.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCOopClosures.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciSymbol.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCPrepareTask.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciSymbol.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCReferenceProcessorExecutor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciType.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCScope.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCScope.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciType.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1FullGCTask.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1FullGCTask.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciTypeArray.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1GCPhaseTimes.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciTypeArray.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1HeapRegionEventSender.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciTypeArrayKlass.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1HeapSizingPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciTypeArrayKlass.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1HeapSizingPolicy_ext.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1HeapSizingPolicy_ext.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciTypeFlow.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1HeapTransition.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1HeapTransition.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciTypeFlow.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1HeapVerifier.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1HeapVerifier.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciUtilities.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1HotCardCache.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1HotCardCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/ciUtilities.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1IHOPControl.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1IHOPControl.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/ci/compilerInterface.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1MMUTracker.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1MMUTracker.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/altHashing.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1MemoryPool.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1MemoryPool.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/altHashing.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1MonitoringSupport.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1MonitoringSupport.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/bytecodeAssembler.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1OopClosures.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1OopClosures.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/bytecodeAssembler.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1OopStarChunkedList.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1OopStarChunkedList.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classFileError.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1PageBasedVirtualSpace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classFileParser.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1ParScanThreadState.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1ParScanThreadState.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classFileParser.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1Policy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1Policy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classFileStream.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1RegionMarkStatsCache.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1RegionMarkStatsCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classFileStream.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1RegionToSpaceMapper.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classListParser.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1RemSet.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1RemSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classListParser.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1RemSetSummary.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1RemSetSummary.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoader.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1RemSetTrackingPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoader.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1RootClosures.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1RootClosures.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoaderData.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1RootProcessor.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1RootProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoaderData.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1SATBMarkQueueSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoaderData.inline.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1StringDedup.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1StringDedup.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoaderExt.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1StringDedupQueue.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1StringDedupQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoaderExt.hpp"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="../../src/hotspot/share/classfile/classLoaderStats.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1StringDedupStat.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1StringDedupStat.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/classLoaderStats.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1SurvivorRegions.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1SurvivorRegions.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/compactHashtable.cpp"
+      <item path="../../src/hotspot/share/gc/g1/g1VMOperations.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1VMOperations.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/compactHashtable.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1YoungGenSizer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1YoungGenSizer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/compactHashtable.inline.hpp"
+      <item path="../../src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="g1YoungRemSetSamplingThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/defaultMethods.cpp"
+      <item path="../../src/hotspot/share/gc/g1/heapRegion.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapRegion.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/defaultMethods.hpp"
+      <item path="../../src/hotspot/share/gc/g1/heapRegionManager.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapRegionManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/dictionary.cpp"
+      <item path="../../src/hotspot/share/gc/g1/heapRegionRemSet.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapRegionRemSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/dictionary.hpp"
+      <item path="../../src/hotspot/share/gc/g1/heapRegionSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapRegionSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/javaAssertions.cpp"
+      <item path="../../src/hotspot/share/gc/g1/heapRegionTracer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapRegionTracer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/javaAssertions.hpp"
+      <item path="../../src/hotspot/share/gc/g1/heapRegionType.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapRegionType.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/javaClasses.cpp"
+      <item path="../../src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmFlagConstraintsG1.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/javaClasses.hpp"
+      <item path="../../src/hotspot/share/gc/g1/sparsePRT.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="sparsePRT.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/javaClasses.inline.hpp"
+      <item path="../../src/hotspot/share/gc/g1/survRateGroup.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="survRateGroup.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/jimage.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/adjoiningGenerations.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/klassFactory.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="adjoiningVirtualSpaces.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/klassFactory.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/asPSOldGen.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="asPSOldGen.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/loaderConstraints.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/asPSYoungGen.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="asPSYoungGen.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/loaderConstraints.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcAdaptivePolicyCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/metadataOnStackMark.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/gcTaskManager.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcTaskManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/metadataOnStackMark.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/gcTaskThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcTaskThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/moduleEntry.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/generationSizer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="generationSizer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/moduleEntry.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/immutableSpace.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="immutableSpace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/modules.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmFlagConstraintsParallel.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/modules.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/mutableNUMASpace.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="mutableNUMASpace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/packageEntry.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/mutableSpace.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="mutableSpace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/packageEntry.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/objectStartArray.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="objectStartArray.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/placeholders.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/parMarkBitMap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="parMarkBitMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/placeholders.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/parallelArguments.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="parallelArguments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/protectionDomainCache.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="parallelScavengeHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/protectionDomainCache.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/pcTasks.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="pcTasks.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/resolutionErrors.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psAdaptiveSizePolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/resolutionErrors.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psCardTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psCardTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/sharedClassUtil.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psCompactionManager.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psCompactionManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/sharedPathsMiscInfo.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psGCAdaptivePolicyCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/sharedPathsMiscInfo.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psGenerationCounters.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psGenerationCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/stackMapFrame.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/psMarkSweep.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psMarkSweep.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/stackMapFrame.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psMarkSweepDecorator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/stackMapTable.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/psMemoryPool.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psMemoryPool.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/stackMapTable.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psOldGen.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psOldGen.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/stackMapTableFormat.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psParallelCompact.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psParallelCompact.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/stringTable.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/psPromotionLAB.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psPromotionLAB.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/stringTable.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psPromotionManager.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psPromotionManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/symbolTable.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/psScavenge.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psScavenge.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/symbolTable.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psTasks.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psTasks.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/systemDictionary.cpp"
+      <item path="../../src/hotspot/share/gc/parallel/psVMOperations.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psVMOperations.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/systemDictionary.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psVirtualspace.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psVirtualspace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/systemDictionaryShared.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/psYoungGen.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="psYoungGen.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/systemDictionary_ext.hpp"
+      <item path="../../src/hotspot/share/gc/parallel/spaceCounters.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="spaceCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/verificationType.cpp"
+      <item path="../../src/hotspot/share/gc/serial/cSpaceCounters.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/verificationType.hpp"
+      <item path="../../src/hotspot/share/gc/serial/defNewGeneration.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="defNewGeneration.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/verifier.cpp"
+      <item path="../../src/hotspot/share/gc/serial/genMarkSweep.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="genMarkSweep.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/verifier.hpp"
+      <item path="../../src/hotspot/share/gc/serial/markSweep.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="markSweep.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/vmSymbols.cpp"
+      <item path="../../src/hotspot/share/gc/serial/serialArguments.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="serialArguments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/vmSymbols.hpp"
+      <item path="../../src/hotspot/share/gc/serial/serialHeap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="serialHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/classfile/vmSymbols_ext.hpp"
+      <item path="../../src/hotspot/share/gc/serial/tenuredGeneration.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="tenuredGeneration.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/codeBlob.cpp"
+      <item path="../../src/hotspot/share/gc/shared/accessBarrierSupport.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="accessBarrierSupport.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/codeBlob.hpp"
+      <item path="../../src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="adaptiveSizePolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/codeCache.cpp"
+      <item path="../../src/hotspot/share/gc/shared/ageTable.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ageTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/codeCache.hpp"
+      <item path="../../src/hotspot/share/gc/shared/ageTableTracer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ageTableTracer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/compiledIC.cpp"
+      <item path="../../src/hotspot/share/gc/shared/allocTracer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="allocTracer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/compiledIC.hpp"
+      <item path="../../src/hotspot/share/gc/shared/barrierSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="barrierSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/compiledMethod.cpp"
+      <item path="../../src/hotspot/share/gc/shared/barrierSetNMethod.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="barrierSetNMethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/compiledMethod.hpp"
+      <item path="../../src/hotspot/share/gc/shared/blockOffsetTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="blockOffsetTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/compiledMethod.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shared/c1/barrierSetC1.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/compressedStream.cpp"
+      <item path="../../src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cardTableBarrierSetC1.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/compressedStream.hpp"
+      <item path="../../src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="modRefBarrierSetC1.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/debugInfo.cpp"
+      <item path="../../src/hotspot/share/gc/shared/c2/barrierSetC2.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/debugInfo.hpp"
+      <item path="../../src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cardTableBarrierSetC2.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/debugInfoRec.cpp"
+      <item path="../../src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="modRefBarrierSetC2.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/debugInfoRec.hpp"
+      <item path="../../src/hotspot/share/gc/shared/cardGeneration.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cardGeneration.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/dependencies.cpp"
+      <item path="../../src/hotspot/share/gc/shared/cardTable.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cardTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/dependencies.hpp"
+      <item path="../../src/hotspot/share/gc/shared/cardTableBarrierSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cardTableBarrierSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/dependencyContext.cpp"
+      <item path="../../src/hotspot/share/gc/shared/cardTableRS.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cardTableRS.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/dependencyContext.hpp"
+      <item path="../../src/hotspot/share/gc/shared/collectedHeap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="collectedHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/exceptionHandlerTable.cpp"
+      <item path="../../src/hotspot/share/gc/shared/collectorCounters.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="collectorCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/exceptionHandlerTable.hpp"
+      <item path="../../src/hotspot/share/gc/shared/collectorPolicy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="collectorPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/icBuffer.cpp"
+      <item path="../../src/hotspot/share/gc/shared/concurrentGCPhaseManager.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="concurrentGCPhaseManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/icBuffer.hpp"
+      <item path="../../src/hotspot/share/gc/shared/concurrentGCThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="concurrentGCThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/jvmticmlr.h"
+      <item path="../../src/hotspot/share/gc/shared/gcArguments.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcArguments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/location.cpp"
+      <item path="../../src/hotspot/share/gc/shared/gcBehaviours.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcBehaviours.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/location.hpp"
+      <item path="../../src/hotspot/share/gc/shared/gcCause.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcCause.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/nativeInst.hpp"
+      <item path="../../src/hotspot/share/gc/shared/gcConfig.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcConfig.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/nmethod.cpp"
+      <item path="../../src/hotspot/share/gc/shared/gcConfiguration.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcConfiguration.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/nmethod.hpp"
+      <item path="../../src/hotspot/share/gc/shared/gcId.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcId.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/oopRecorder.cpp"
+      <item path="../../src/hotspot/share/gc/shared/gcLocker.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcLocker.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/oopRecorder.hpp"
+      <item path="../../src/hotspot/share/gc/shared/gcPolicyCounters.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcPolicyCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/pcDesc.cpp"
+      <item path="../../src/hotspot/share/gc/shared/gcStats.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcStats.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/pcDesc.hpp"
+      <item path="../../src/hotspot/share/gc/shared/gcTimer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcTimer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/relocInfo.cpp"
+      <item path="../../src/hotspot/share/gc/shared/gcTrace.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcTrace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/relocInfo.hpp"
+      <item path="../../src/hotspot/share/gc/shared/gcTraceSend.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcTraceSend.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/relocInfo_ext.cpp"
+      <item path="../../src/hotspot/share/gc/shared/gcTraceTime.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcTraceTime.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/relocInfo_ext.hpp"
+      <item path="../../src/hotspot/share/gc/shared/gcUtil.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcUtil.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/scopeDesc.cpp"
+      <item path="../../src/hotspot/share/gc/shared/gcVMOperations.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="gcVMOperations.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/scopeDesc.hpp"
+      <item path="../../src/hotspot/share/gc/shared/genCollectedHeap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="genCollectedHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/stubs.cpp"
+      <item path="../../src/hotspot/share/gc/shared/genMemoryPools.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="genMemoryPools.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/stubs.hpp"
+      <item path="../../src/hotspot/share/gc/shared/generation.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="generation.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/vmreg.cpp"
+      <item path="../../src/hotspot/share/gc/shared/generationCounters.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="generationCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/vmreg.hpp"
+      <item path="../../src/hotspot/share/gc/shared/generationSpec.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="generationSpec.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/vmreg.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shared/hSpaceCounters.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="hSpaceCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/vtableStubs.cpp"
+      <item path="../../src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmFlagConstraintsGC.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/code/vtableStubs.hpp"
+      <item path="../../src/hotspot/share/gc/shared/markBitMap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="markBitMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/abstractCompiler.cpp"
+      <item path="../../src/hotspot/share/gc/shared/memAllocator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="memAllocator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/abstractCompiler.hpp"
+      <item path="../../src/hotspot/share/gc/shared/objectCountEventSender.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="objectCountEventSender.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compileBroker.cpp"
+      <item path="../../src/hotspot/share/gc/shared/oopStorage.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="oopStorage.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compileBroker.hpp"
+      <item path="../../src/hotspot/share/gc/shared/owstTaskTerminator.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="owstTaskTerminator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compileLog.cpp"
+      <item path="../../src/hotspot/share/gc/shared/parallelCleaning.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="parallelCleaning.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compileLog.hpp"
+      <item path="../../src/hotspot/share/gc/shared/plab.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="plab.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compileTask.cpp"
+      <item path="../../src/hotspot/share/gc/shared/preservedMarks.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="preservedMarks.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compileTask.hpp"
+      <item path="../../src/hotspot/share/gc/shared/ptrQueue.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
-      </item>
-      <item path="../../src/hotspot/share/compiler/compilerDefinitions.cpp"
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="ptrQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../src/hotspot/share/gc/shared/referencePolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="referencePolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compilerDefinitions.hpp"
+      <item path="../../src/hotspot/share/gc/shared/referenceProcessor.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="referenceProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compilerDirectives.cpp"
+      <item path="../../src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="referenceProcessorPhaseTimes.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compilerDirectives.hpp"
+      <item path="../../src/hotspot/share/gc/shared/satbMarkQueue.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="satbMarkQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compilerOracle.cpp"
+      <item path="../../src/hotspot/share/gc/shared/softRefGenPolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="softRefGenPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/compilerOracle.hpp"
+      <item path="../../src/hotspot/share/gc/shared/softRefPolicy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="softRefPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/directivesParser.cpp"
+      <item path="../../src/hotspot/share/gc/shared/space.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="space.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/directivesParser.hpp"
+      <item path="../../src/hotspot/share/gc/shared/spaceDecorator.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="spaceDecorator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/disassembler.cpp"
+      <item path="../../src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/disassembler.hpp"
+      <item path="../../src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stringDedupQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/methodLiveness.cpp"
+      <item path="../../src/hotspot/share/gc/shared/stringdedup/stringDedupStat.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stringDedupStat.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/methodLiveness.hpp"
+      <item path="../../src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stringDedupTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/methodMatcher.cpp"
+      <item path="../../src/hotspot/share/gc/shared/stringdedup/stringDedupThread.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="stringDedupThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/methodMatcher.hpp"
+      <item path="../../src/hotspot/share/gc/shared/strongRootsScope.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="strongRootsScope.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/oopMap.cpp"
+      <item path="../../src/hotspot/share/gc/shared/suspendibleThreadSet.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="suspendibleThreadSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/compiler/oopMap.hpp"
+      <item path="../../src/hotspot/share/gc/shared/taskqueue.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="taskqueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/adaptiveFreeList.cpp"
+      <item path="../../src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="threadLocalAllocBuffer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/adaptiveFreeList.hpp"
+      <item path="../../src/hotspot/share/gc/shared/weakProcessor.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="weakProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/allocationStats.cpp"
+      <item path="../../src/hotspot/share/gc/shared/weakProcessorPhaseTimes.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="weakProcessorPhaseTimes.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/allocationStats.hpp"
+      <item path="../../src/hotspot/share/gc/shared/weakProcessorPhases.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="weakProcessorPhases.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/cmsCollectorPolicy.cpp"
+      <item path="../../src/hotspot/share/gc/shared/workerDataArray.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="workerDataArray.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp"
+      <item path="../../src/hotspot/share/gc/shared/workerPolicy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="workerPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/cmsLockVerifier.cpp"
+      <item path="../../src/hotspot/share/gc/shared/workgroup.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="workgroup.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/cmsLockVerifier.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/cmsOopClosures.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/cmsOopClosures.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahSupport.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahAggressiveHeuristics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahCompactHeuristics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahPassiveHeuristics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahStaticHeuristics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahTraversalHeuristics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahAllocTracker.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahArguments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/freeChunk.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahAsserts.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/freeChunk.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahBarrierSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/gSpaceCounters.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahCodeRoots.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/gSpaceCounters.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahCollectionSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/parCardTableModRefBS.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahCollectorPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/parNewGeneration.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahConcurrentMark.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/parNewGeneration.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahControlThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/parNewGeneration.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahEvacOOMHandler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/parOopClosures.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahFreeSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/parOopClosures.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/parOopClosures.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahHeapRegion.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/promotionInfo.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahHeapRegionCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/promotionInfo.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahHeapRegionSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/vmCMSOperations.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahHeuristics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/vmCMSOperations.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahMarkCompact.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/vmStructs_cms.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahMarkingContext.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/vmStructs_parNew.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahMemoryPool.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/yieldingWorkgroup.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahMetrics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/cms/yieldingWorkgroup.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahMonitoringSupport.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/bufferingOopClosure.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahNumberSeq.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/collectionSetChooser.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahPacer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/collectionSetChooser.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahPhaseTimings.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/concurrentG1Refine.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahRootProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/concurrentG1Refine.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahRuntime.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/concurrentG1RefineThread.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahSATBMarkQueueSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/concurrentG1RefineThread.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahStrDedupQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/concurrentMarkThread.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahStringDedup.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahStringDedup.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/concurrentMarkThread.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahTaskqueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/concurrentMarkThread.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahTimingTracker.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/dirtyCardQueue.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahTraversalGC.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/dirtyCardQueue.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahUtils.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/evacuationInfo.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahVMOperations.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1AllocRegion.cpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahVerifier.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1AllocRegion.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahWorkGroup.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp"
+      <item path="../../src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="shenandoahWorkerPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1AllocationContext.hpp"
+      <item path="../../src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Allocator.cpp"
+      <item path="../../src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Allocator.hpp"
+      <item path="../../src/hotspot/share/gc/z/vmStructs_z.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vmStructs_z.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Allocator.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zAddress.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zAddress.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Allocator_ext.cpp"
+      <item path="../../src/hotspot/share/gc/z/zArguments.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zArguments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Analytics.cpp"
+      <item path="../../src/hotspot/share/gc/z/zBarrier.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zBarrier.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Analytics.hpp"
+      <item path="../../src/hotspot/share/gc/z/zBarrierSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zBarrierSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1BiasedArray.cpp"
+      <item path="../../src/hotspot/share/gc/z/zBarrierSetAssembler.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zBarrierSetAssembler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1BiasedArray.hpp"
+      <item path="../../src/hotspot/share/gc/z/zBarrierSetNMethod.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zBarrierSetNMethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp"
+      <item path="../../src/hotspot/share/gc/z/zBarrierSetRuntime.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zBarrierSetRuntime.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp"
+      <item path="../../src/hotspot/share/gc/z/zCPU.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zCPU.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zCollectedHeap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zCollectedHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CardCounts.cpp"
+      <item path="../../src/hotspot/share/gc/z/zCollectorPolicy.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zCollectorPolicy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CardCounts.hpp"
+      <item path="../../src/hotspot/share/gc/z/zDirector.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zDirector.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CardLiveData.cpp"
+      <item path="../../src/hotspot/share/gc/z/zDriver.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zDriver.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CardLiveData.hpp"
+      <item path="../../src/hotspot/share/gc/z/zErrno.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zErrno.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CardLiveData.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zForwardingTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zForwardingTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp"
+      <item path="../../src/hotspot/share/gc/z/zGlobals.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zGlobals.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp"
+      <item path="../../src/hotspot/share/gc/z/zHeap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zHeap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp"
+      <item path="../../src/hotspot/share/gc/z/zHeapIterator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zHeapIterator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp"
+      <item path="../../src/hotspot/share/gc/z/zInitialize.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zInitialize.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp"
+      <item path="../../src/hotspot/share/gc/z/zLargePages.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zLargePages.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectedHeap.cpp"
+      <item path="../../src/hotspot/share/gc/z/zLiveMap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zLiveMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectedHeap.hpp"
+      <item path="../../src/hotspot/share/gc/z/zMark.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zMark.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zMarkCache.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zMarkCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectedHeap_ext.cpp"
+      <item path="../../src/hotspot/share/gc/z/zMarkStack.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zMarkStack.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectionSet.cpp"
+      <item path="../../src/hotspot/share/gc/z/zMarkStackAllocator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zMarkStackAllocator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectionSet.hpp"
+      <item path="../../src/hotspot/share/gc/z/zMemory.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zMemory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectorPolicy.cpp"
+      <item path="../../src/hotspot/share/gc/z/zMetronome.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zMetronome.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectorPolicy.hpp"
+      <item path="../../src/hotspot/share/gc/z/zNMethodTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zNMethodTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1CollectorState.hpp"
+      <item path="../../src/hotspot/share/gc/z/zNUMA.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zNUMA.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMark.cpp"
+      <item path="../../src/hotspot/share/gc/z/zObjectAllocator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zObjectAllocator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMark.hpp"
+      <item path="../../src/hotspot/share/gc/z/zOopClosures.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zOopClosures.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zPage.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zPage.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.cpp"
+      <item path="../../src/hotspot/share/gc/z/zPageAllocator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zPageAllocator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp"
+      <item path="../../src/hotspot/share/gc/z/zPageCache.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zPageCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zPageTable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zPageTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp"
+      <item path="../../src/hotspot/share/gc/z/zPhysicalMemory.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zPhysicalMemory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
+      <item path="../../src/hotspot/share/gc/z/zPreMappedMemory.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zPreMappedMemory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zReferenceProcessor.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zReferenceProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1DefaultPolicy.cpp"
+      <item path="../../src/hotspot/share/gc/z/zRelocate.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zRelocate.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1DefaultPolicy.hpp"
+      <item path="../../src/hotspot/share/gc/z/zRelocationSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zRelocationSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1EdenRegions.hpp"
+      <item path="../../src/hotspot/share/gc/z/zRelocationSetSelector.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zRelocationSetSelector.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1EvacFailure.cpp"
+      <item path="../../src/hotspot/share/gc/z/zResurrection.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zResurrection.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1EvacFailure.hpp"
+      <item path="../../src/hotspot/share/gc/z/zRootsIterator.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zRootsIterator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1EvacStats.cpp"
+      <item path="../../src/hotspot/share/gc/z/zRuntimeWorkers.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zRuntimeWorkers.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1EvacStats.hpp"
+      <item path="../../src/hotspot/share/gc/z/zServiceability.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zServiceability.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1EvacStats.inline.hpp"
+      <item path="../../src/hotspot/share/gc/z/zStat.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zStat.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1FromCardCache.cpp"
+      <item path="../../src/hotspot/share/gc/z/zStatTLAB.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zStatTLAB.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1FromCardCache.hpp"
+      <item path="../../src/hotspot/share/gc/z/zTask.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zTask.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1FullGCScope.cpp"
+      <item path="../../src/hotspot/share/gc/z/zThread.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1FullGCScope.hpp"
+      <item path="../../src/hotspot/share/gc/z/zTracer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zTracer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp"
+      <item path="../../src/hotspot/share/gc/z/zUnload.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zUnload.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp"
+      <item path="../../src/hotspot/share/gc/z/zUtils.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zUtils.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HRPrinter.hpp"
+      <item path="../../src/hotspot/share/gc/z/zVirtualMemory.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zVirtualMemory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp"
+      <item path="../../src/hotspot/share/gc/z/zWeakRootsProcessor.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zWeakRootsProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp"
+      <item path="../../src/hotspot/share/gc/z/zWorkers.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="zWorkers.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp"
+      <item path="../../src/hotspot/share/interpreter/abstractInterpreter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapSizingPolicy_ext.cpp"
+      <item path="../../src/hotspot/share/interpreter/bytecode.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bytecode.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapTransition.cpp"
+      <item path="../../src/hotspot/share/interpreter/bytecodeHistogram.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bytecodeHistogram.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapTransition.hpp"
+      <item path="../../src/hotspot/share/interpreter/bytecodeInterpreter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
-      </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapVerifier.cpp"
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bytecodeInterpreter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../src/hotspot/share/interpreter/bytecodeStream.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bytecodeStream.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HeapVerifier.hpp"
+      <item path="../../src/hotspot/share/interpreter/bytecodeTracer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bytecodeTracer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HotCardCache.cpp"
+      <item path="../../src/hotspot/share/interpreter/bytecodes.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bytecodes.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1HotCardCache.hpp"
+      <item path="../../src/hotspot/share/interpreter/cppInterpreter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cppInterpreter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1IHOPControl.cpp"
+      <item path="../../src/hotspot/share/interpreter/cppInterpreterGenerator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cppInterpreterGenerator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1IHOPControl.hpp"
+      <item path="../../src/hotspot/share/interpreter/interpreter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="interpreter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1InCSetState.hpp"
+      <item path="../../src/hotspot/share/interpreter/interpreterRuntime.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="interpreterRuntime.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp"
+      <item path="../../src/hotspot/share/interpreter/invocationCounter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="invocationCounter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1MMUTracker.cpp"
+      <item path="../../src/hotspot/share/interpreter/linkResolver.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="linkResolver.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1MMUTracker.hpp"
+      <item path="../../src/hotspot/share/interpreter/oopMapCache.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="oopMapCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1MarkSweep.cpp"
+      <item path="../../src/hotspot/share/interpreter/rewriter.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="rewriter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1MarkSweep.hpp"
+      <item path="../../src/hotspot/share/interpreter/templateInterpreter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="templateInterpreter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1MarkSweep_ext.cpp"
+      <item path="../../src/hotspot/share/interpreter/templateInterpreterGenerator.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="templateInterpreterGenerator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1MonitoringSupport.cpp"
+      <item path="../../src/hotspot/share/interpreter/templateTable.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="templateTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1MonitoringSupport.hpp"
+      <item path="../../src/hotspot/share/jfr/dcmd/jfrDcmds.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1OopClosures.cpp"
+      <item path="../../src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1OopClosures.hpp"
+      <item path="../../src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrJvmtiAgent.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1OopClosures.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/jfr.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfr.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp"
+      <item path="../../src/hotspot/share/jfr/jni/jfrGetAllEventClasses.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp"
+      <item path="../../src/hotspot/share/jfr/jni/jfrJavaCall.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrJavaCall.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ParScanThreadState.cpp"
+      <item path="../../src/hotspot/share/jfr/jni/jfrJavaSupport.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrJavaSupport.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ParScanThreadState.hpp"
+      <item path="../../src/hotspot/share/jfr/jni/jfrJniMethod.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrJniMethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrJniMethodRegistration.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1ParScanThreadState_ext.cpp"
+      <item path="../../src/hotspot/share/jfr/jni/jfrUpcalls.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrUpcalls.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Policy.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1Predictions.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/bitset.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="bitset.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="dfsClosure.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/edge.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="edge.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RemSet.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="edgeQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RemSet.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/edgeStore.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="edgeStore.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RemSet.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="edgeUtils.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RemSetSummary.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="rootSetClosure.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RemSetSummary.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RootClosures.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="objectSampleDescription.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RootClosures.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="objectSampleWriter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RootClosures_ext.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="rootResolver.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RootProcessor.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/emitEventOperation.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="emitEventOperation.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1RootProcessor.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/leakProfiler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="leakProfiler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/sampling/sampleList.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="sampleList.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SATBCardTableModRefBS.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="samplePriorityQueue.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SerialFullCollector.cpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SerialFullCollector.hpp"
+      <item path="../../src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="saveRestore.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SharedClosures.hpp"
+      <item path="../../src/hotspot/share/jfr/periodic/jfrModuleEvent.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrModuleEvent.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedup.cpp"
+      <item path="../../src/hotspot/share/jfr/periodic/jfrNetworkUtilization.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrNetworkUtilization.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedup.hpp"
+      <item path="../../src/hotspot/share/jfr/periodic/jfrOSInterface.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrOSInterface.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupQueue.cpp"
+      <item path="../../src/hotspot/share/jfr/periodic/jfrPeriodic.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrPeriodic.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupQueue.hpp"
+      <item path="../../src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrThreadCPULoadEvent.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupStat.cpp"
+      <item path="../../src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrThreadDumpEvent.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupStat.hpp"
+      <item path="../../src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupTable.cpp"
+      <item path="../../src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrThreadSampler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupTable.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrCheckpointBlob.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupThread.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrCheckpointManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1StringDedupThread.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrCheckpointWriter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SurvivorRegions.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrMetadataEvent.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1SurvivorRegions.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrThreadGroup.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1YCTypes.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrThreadState.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1YoungGenSizer.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrType.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1YoungGenSizer.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrTypeManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrTypeSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrTypeSetUtils.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1_globals.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1_globals.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrTraceIdEpoch.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/g1_specialized_oop_closures.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/jfrEventSetting.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrEventSetting.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/hSpaceCounters.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/jfrRecorder.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrRecorder.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/hSpaceCounters.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegion.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/repository/jfrChunkState.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrChunkState.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegion.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrChunkWriter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegion.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrEmergencyDump.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionBounds.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrRepository.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/service/jfrEvent.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionManager.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/service/jfrMemorySizer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrMemorySizer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionManager.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrOptionSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionManager.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrPostBox.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionRemSet.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrRecorderService.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionRemSet.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrRecorderThread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionSet.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrRecorderThreadLoop.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionSet.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionSet.inline.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/storage/jfrBuffer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionTracer.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrStorage.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionTracer.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/storage/jfrStorageControl.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrStorageControl.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionType.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrVirtualMemory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/heapRegionType.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/ptrQueue.cpp"
+      <item path="../../src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrStringPoolBuffer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/ptrQueue.hpp"
+      <item path="../../src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrStringPoolWriter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/satbMarkQueue.cpp"
+      <item path="../../src/hotspot/share/jfr/support/jfrAllocationTracer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/satbMarkQueue.hpp"
+      <item path="../../src/hotspot/share/jfr/support/jfrEventClass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrEventClass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/sparsePRT.cpp"
+      <item path="../../src/hotspot/share/jfr/support/jfrFlush.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrFlush.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/sparsePRT.hpp"
+      <item path="../../src/hotspot/share/jfr/support/jfrStackTraceMark.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrStackTraceMark.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/survRateGroup.cpp"
+      <item path="../../src/hotspot/share/jfr/support/jfrThreadLocal.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrThreadLocal.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/survRateGroup.hpp"
+      <item path="../../src/hotspot/share/jfr/utilities/jfrAllocation.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/suspendibleThreadSet.cpp"
+      <item path="../../src/hotspot/share/jfr/utilities/jfrJavaLog.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrJavaLog.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/suspendibleThreadSet.hpp"
+      <item path="../../src/hotspot/share/jfr/utilities/jfrTime.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrTime.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/vmStructs_g1.hpp"
+      <item path="../../src/hotspot/share/jfr/utilities/jfrTimeConverter.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jfrTimeConverter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/vm_operations_g1.cpp"
+      <item path="../../src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/g1/vm_operations_g1.hpp"
+      <item path="../../src/hotspot/share/jvmci/compilerRuntime.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/adjoiningGenerations.cpp"
+      <item path="../../src/hotspot/share/jvmci/jvmciCodeInstaller.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciCodeInstaller.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/adjoiningGenerations.hpp"
+      <item path="../../src/hotspot/share/jvmci/jvmciCompiler.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciCompiler.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.cpp"
+      <item path="../../src/hotspot/share/jvmci/jvmciCompilerToVM.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciCompilerToVM.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp"
+      <item path="../../src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciCompilerToVMInit.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/asPSOldGen.cpp"
+      <item path="../../src/hotspot/share/jvmci/jvmciEnv.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciEnv.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/asPSOldGen.hpp"
+      <item path="../../src/hotspot/share/jvmci/jvmciJavaClasses.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciJavaClasses.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/asPSYoungGen.cpp"
+      <item path="../../src/hotspot/share/jvmci/jvmciRuntime.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmciRuntime.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/asPSYoungGen.hpp"
+      <item path="../../src/hotspot/share/jvmci/jvmci_globals.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="jvmci_globals.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/cardTableExtension.cpp"
+      <item path="../../src/hotspot/share/jvmci/vmStructs_jvmci.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vmStructs_jvmci.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/cardTableExtension.hpp"
+      <item path="../../src/hotspot/share/libadt/dict.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.cpp"
+      <item path="../../src/hotspot/share/libadt/set.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="set.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp"
+      <item path="../../src/hotspot/share/libadt/vectset.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="vectset.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/gcTaskManager.cpp"
+      <item path="../../src/hotspot/share/logging/logConfiguration.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/gcTaskManager.hpp"
+      <item path="../../src/hotspot/share/logging/logDecorations.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logDecorations.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/gcTaskThread.cpp"
+      <item path="../../src/hotspot/share/logging/logDecorators.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logDecorators.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/gcTaskThread.hpp"
+      <item path="../../src/hotspot/share/logging/logDiagnosticCommand.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logDiagnosticCommand.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/generationSizer.cpp"
+      <item path="../../src/hotspot/share/logging/logFileOutput.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logFileOutput.cpp"</Elem>
+            <Elem>_FILE_OFFSET_BITS=64</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/generationSizer.hpp"
+      <item path="../../src/hotspot/share/logging/logFileStreamOutput.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logFileStreamOutput.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/immutableSpace.cpp"
+      <item path="../../src/hotspot/share/logging/logLevel.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logLevel.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/immutableSpace.hpp"
+      <item path="../../src/hotspot/share/logging/logMessageBuffer.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logMessageBuffer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/mutableNUMASpace.cpp"
+      <item path="../../src/hotspot/share/logging/logOutput.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logOutput.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/mutableNUMASpace.hpp"
+      <item path="../../src/hotspot/share/logging/logOutputList.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logOutputList.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/mutableSpace.cpp"
+      <item path="../../src/hotspot/share/logging/logSelection.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logSelection.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/mutableSpace.hpp"
+      <item path="../../src/hotspot/share/logging/logSelectionList.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logSelectionList.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/objectStartArray.cpp"
+      <item path="../../src/hotspot/share/logging/logStream.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logStream.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/objectStartArray.hpp"
+      <item path="../../src/hotspot/share/logging/logTag.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logTag.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/objectStartArray.inline.hpp"
+      <item path="../../src/hotspot/share/logging/logTagSet.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logTagSet.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/parMarkBitMap.cpp"
+      <item path="../../src/hotspot/share/logging/logTagSetDescriptions.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="logTagSetDescriptions.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/parMarkBitMap.hpp"
+      <item path="../../src/hotspot/share/memory/allocation.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="allocation.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp"
+      <item path="../../src/hotspot/share/memory/arena.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="arena.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp"
+      <item path="../../src/hotspot/share/memory/filemap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="filemap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp"
+      <item path="../../src/hotspot/share/memory/guardedMemory.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="guardedMemory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp"
+      <item path="../../src/hotspot/share/memory/heap.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/pcTasks.cpp"
+      <item path="../../src/hotspot/share/memory/heapInspection.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapInspection.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/pcTasks.hpp"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="../../src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp"
+      <item path="../../src/hotspot/share/memory/heapShared.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="heapShared.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp"
+      <item path="../../src/hotspot/share/memory/iterator.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="iterator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psCompactionManager.cpp"
+      <item path="../../src/hotspot/share/memory/memRegion.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="memRegion.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psCompactionManager.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/blockFreelist.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp"
+      <item path="../../src/hotspot/share/memory/metaspace/chunkManager.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="chunkManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/metaDebug.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaDebug.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psGenerationCounters.cpp"
+      <item path="../../src/hotspot/share/memory/metaspace/metachunk.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metachunk.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psGenerationCounters.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/metaspaceCommon.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspaceCommon.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psMarkSweep.cpp"
+      <item path="../../src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspaceDCmd.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psMarkSweep.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspaceStatistics.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp"
+      <item path="../../src/hotspot/share/memory/metaspace/occupancyMap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="occupancyMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="printCLDMetaspaceInfoClosure.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psOldGen.cpp"
+      <item path="../../src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="printMetaspaceInfoKlassClosure.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psOldGen.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/smallBlocks.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="smallBlocks.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psParallelCompact.cpp"
+      <item path="../../src/hotspot/share/memory/metaspace/spaceManager.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="spaceManager.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psParallelCompact.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/virtualSpaceList.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="virtualSpaceList.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp"
+      <item path="../../src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="virtualSpaceNode.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psPromotionLAB.cpp"
+      <item path="../../src/hotspot/share/memory/metaspaceClosure.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspaceClosure.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psPromotionLAB.hpp"
+      <item path="../../src/hotspot/share/memory/metaspaceCounters.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspaceCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp"
+      <item path="../../src/hotspot/share/memory/metaspaceShared.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspaceShared.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psPromotionManager.cpp"
+      <item path="../../src/hotspot/share/memory/metaspaceTracer.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metaspaceTracer.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psPromotionManager.hpp"
+      <item path="../../src/hotspot/share/memory/oopFactory.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="oopFactory.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp"
+      <item path="../../src/hotspot/share/memory/operator_new.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="operator_new.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psScavenge.cpp"
+      <item path="../../src/hotspot/share/memory/resourceArea.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="resourceArea.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psScavenge.hpp"
+      <item path="../../src/hotspot/share/memory/universe.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="universe.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psScavenge.inline.hpp"
+      <item path="../../src/hotspot/share/memory/virtualspace.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="virtualspace.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psTasks.cpp"
+      <item path="../../src/hotspot/share/oops/access.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psTasks.hpp"
+      <item path="../../src/hotspot/share/oops/accessBackend.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="accessBackend.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psVirtualspace.cpp"
+      <item path="../../src/hotspot/share/oops/annotations.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="annotations.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psVirtualspace.hpp"
+      <item path="../../src/hotspot/share/oops/arrayKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="arrayKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psYoungGen.cpp"
+      <item path="../../src/hotspot/share/oops/compiledICHolder.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledICHolder.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/psYoungGen.hpp"
+      <item path="../../src/hotspot/share/oops/constMethod.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="constMethod.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/spaceCounters.cpp"
+      <item path="../../src/hotspot/share/oops/constantPool.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="constantPool.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/spaceCounters.hpp"
+      <item path="../../src/hotspot/share/oops/cpCache.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="cpCache.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/vmPSOperations.cpp"
+      <item path="../../src/hotspot/share/oops/generateOopMap.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="generateOopMap.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/vmPSOperations.hpp"
+      <item path="../../src/hotspot/share/oops/instanceKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="instanceKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp"
+      <item path="../../src/hotspot/share/oops/instanceMirrorKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="instanceMirrorKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/cSpaceCounters.cpp"
+      <item path="../../src/hotspot/share/oops/instanceOop.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="instanceOop.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/cSpaceCounters.hpp"
+      <item path="../../src/hotspot/share/oops/instanceRefKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="instanceRefKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/defNewGeneration.cpp"
+      <item path="../../src/hotspot/share/oops/klass.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="klass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/defNewGeneration.hpp"
+      <item path="../../src/hotspot/share/oops/klassVtable.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="klassVtable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/defNewGeneration.inline.hpp"
+      <item path="../../src/hotspot/share/oops/markOop.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="markOop.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/genMarkSweep.cpp"
+      <item path="../../src/hotspot/share/oops/metadata.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="metadata.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/genMarkSweep.hpp"
+      <item path="../../src/hotspot/share/oops/method.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="method.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/markSweep.cpp"
+      <item path="../../src/hotspot/share/oops/methodCounters.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="methodCounters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/markSweep.hpp"
+      <item path="../../src/hotspot/share/oops/methodData.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="methodData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/markSweep.inline.hpp"
+      <item path="../../src/hotspot/share/oops/objArrayKlass.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="objArrayKlass.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/tenuredGeneration.cpp"
+      <item path="../../src/hotspot/share/oops/objArrayOop.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="objArrayOop.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/tenuredGeneration.hpp"
+      <item path="../../src/hotspot/share/oops/oop.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="oop.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp"
+      <item path="../../src/hotspot/share/oops/oopsHierarchy.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="oopsHierarchy.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/shared/adaptiveSizePolicy.cpp"
+      <item path="../../src/hotspot/share/oops/reflectionAccessorImplKlassHelper.cpp"
             ex="false"
             tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>THIS_FILE="reflectionAccessorImplKlassHelper.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
       </item>
-      <item path="../../src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp"
+      <item path="../../src/hotspot/share/oops/symbol.cpp"
             ex="false"
-            tool="3"
+            tool="1"
             flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>TH