Mercurial > hg > graal-compiler
diff src/cpu/sparc/vm/interp_masm_sparc.hpp @ 7232:310a68c63b69
Merge.
| author | Christian Haeubl <haeubl@ssw.jku.at> |
|---|---|
| date | Fri, 14 Dec 2012 15:19:38 +0100 |
| parents | f0c2369fda5a |
| children | aeaca88565e6 |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/interp_masm_sparc.hpp Fri Dec 14 14:53:42 2012 +0100 +++ b/src/cpu/sparc/vm/interp_masm_sparc.hpp Fri Dec 14 15:19:38 2012 +0100 @@ -25,7 +25,7 @@ #ifndef CPU_SPARC_VM_INTERP_MASM_SPARC_HPP #define CPU_SPARC_VM_INTERP_MASM_SPARC_HPP -#include "assembler_sparc.inline.hpp" +#include "asm/macroAssembler.inline.hpp" #include "interpreter/invocationCounter.hpp" // This file specializes the assember with interpreter-specific macros