1.1 --- a/src/share/vm/c1/c1_MacroAssembler.hpp Fri Nov 30 11:44:05 2012 -0800 1.2 +++ b/src/share/vm/c1/c1_MacroAssembler.hpp Fri Nov 30 15:23:16 2012 -0800 1.3 @@ -25,22 +25,8 @@ 1.4 #ifndef SHARE_VM_C1_C1_MACROASSEMBLER_HPP 1.5 #define SHARE_VM_C1_C1_MACROASSEMBLER_HPP 1.6 1.7 -#include "asm/assembler.hpp" 1.8 -#ifdef TARGET_ARCH_x86 1.9 -# include "assembler_x86.inline.hpp" 1.10 -#endif 1.11 -#ifdef TARGET_ARCH_sparc 1.12 -# include "assembler_sparc.inline.hpp" 1.13 -#endif 1.14 -#ifdef TARGET_ARCH_zero 1.15 -# include "assembler_zero.inline.hpp" 1.16 -#endif 1.17 -#ifdef TARGET_ARCH_arm 1.18 -# include "assembler_arm.inline.hpp" 1.19 -#endif 1.20 -#ifdef TARGET_ARCH_ppc 1.21 -# include "assembler_ppc.inline.hpp" 1.22 -#endif 1.23 +#include "asm/macroAssembler.hpp" 1.24 +#include "asm/macroAssembler.inline.hpp" 1.25 1.26 class CodeEmitInfo; 1.27