Merge
authoriveresov
Wed, 02 Apr 2014 12:27:57 -0700
changeset 23531 7407bf60b6d3
parent 23529 a77755391144 (diff)
parent 23530 b0fb0c2df62b (current diff)
child 23533 a7cf918e5584
Merge
--- a/hotspot/src/share/vm/adlc/main.cpp	Wed Apr 02 11:24:51 2014 -0700
+++ b/hotspot/src/share/vm/adlc/main.cpp	Wed Apr 02 12:27:57 2014 -0700
@@ -243,7 +243,6 @@
   AD.addInclude(AD._CPP_file, "vmreg_arm.inline.hpp");
 #endif
 #ifdef TARGET_ARCH_ppc
-  AD.addInclude(AD._CPP_file, "assembler_ppc.inline.hpp");
   AD.addInclude(AD._CPP_file, "nativeInst_ppc.hpp");
   AD.addInclude(AD._CPP_file, "vmreg_ppc.inline.hpp");
 #endif
@@ -274,6 +273,7 @@
   AD.addInclude(AD._DFA_file, "opto/cfgnode.hpp");  // Use PROB_MAX in predicate.
   AD.addInclude(AD._DFA_file, "opto/matcher.hpp");
   AD.addInclude(AD._DFA_file, "opto/opcodes.hpp");
+  AD.addInclude(AD._DFA_file, "opto/convertnode.hpp");
   // Make sure each .cpp file starts with include lines:
   // files declaring and defining generators for Mach* Objects (hpp,cpp)
   // Generate the result files: