Mercurial > hg > truffle
diff src/cpu/x86/vm/vtableStubs_x86_64.cpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | cd3d6a6b95d9 |
children | 740e263c80c6 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/vtableStubs_x86_64.cpp Fri Nov 30 17:00:32 2012 -0800 +++ b/src/cpu/x86/vm/vtableStubs_x86_64.cpp Fri Dec 07 01:09:03 2012 -0800 @@ -23,8 +23,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_x86.inline.hpp" +#include "asm/macroAssembler.hpp" #include "code/vtableStubs.hpp" #include "interp_masm_x86_64.hpp" #include "memory/resourceArea.hpp"