1.1 --- a/src/share/vm/adlc/main.cpp Mon Nov 26 15:11:55 2012 +0100 1.2 +++ b/src/share/vm/adlc/main.cpp Thu Dec 06 09:57:41 2012 -0800 1.3 @@ -212,7 +212,7 @@ 1.4 AD.addInclude(AD._CPP_file, "adfiles", get_basename(AD._VM_file._name)); 1.5 AD.addInclude(AD._CPP_file, "adfiles", get_basename(AD._HPP_file._name)); 1.6 AD.addInclude(AD._CPP_file, "memory/allocation.inline.hpp"); 1.7 - AD.addInclude(AD._CPP_file, "asm/assembler.hpp"); 1.8 + AD.addInclude(AD._CPP_file, "asm/macroAssembler.inline.hpp"); 1.9 AD.addInclude(AD._CPP_file, "code/vmreg.hpp"); 1.10 AD.addInclude(AD._CPP_file, "gc_interface/collectedHeap.inline.hpp"); 1.11 AD.addInclude(AD._CPP_file, "oops/compiledICHolder.hpp"); 1.12 @@ -231,17 +231,14 @@ 1.13 AD.addInclude(AD._CPP_file, "runtime/stubRoutines.hpp"); 1.14 AD.addInclude(AD._CPP_file, "utilities/growableArray.hpp"); 1.15 #ifdef TARGET_ARCH_x86 1.16 - AD.addInclude(AD._CPP_file, "assembler_x86.inline.hpp"); 1.17 AD.addInclude(AD._CPP_file, "nativeInst_x86.hpp"); 1.18 AD.addInclude(AD._CPP_file, "vmreg_x86.inline.hpp"); 1.19 #endif 1.20 #ifdef TARGET_ARCH_sparc 1.21 - AD.addInclude(AD._CPP_file, "assembler_sparc.inline.hpp"); 1.22 AD.addInclude(AD._CPP_file, "nativeInst_sparc.hpp"); 1.23 AD.addInclude(AD._CPP_file, "vmreg_sparc.inline.hpp"); 1.24 #endif 1.25 #ifdef TARGET_ARCH_arm 1.26 - AD.addInclude(AD._CPP_file, "assembler_arm.inline.hpp"); 1.27 AD.addInclude(AD._CPP_file, "nativeInst_arm.hpp"); 1.28 AD.addInclude(AD._CPP_file, "vmreg_arm.inline.hpp"); 1.29 #endif