diff options
| -rw-r--r-- | emulators/dynamips-devel/Makefile | 6 | ||||
| -rw-r--r-- | emulators/dynamips-devel/files/patch-nojit_trans.c | 4 | ||||
| -rw-r--r-- | emulators/dynamips/Makefile | 6 | ||||
| -rw-r--r-- | emulators/dynamips/files/patch-nojit_trans.c | 4 |
4 files changed, 8 insertions, 12 deletions
diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile index 14cba1cd8be0..6c95a1316dc1 100644 --- a/emulators/dynamips-devel/Makefile +++ b/emulators/dynamips-devel/Makefile @@ -37,10 +37,8 @@ do-install: .include <bsd.port.pre.mk> -.if ${ARCH} == "i386" -DYNAMIPS_ARCH= "x86" -.elif ${ARCH} == "amd64" -DYNAMIPS_ARCH= "nojit" # JIT does not work on amd64 for some reason +.if ${ARCH} == "i386" #|| ${ARCH} == "amd64" +DYNAMIPS_ARCH= "${ARCH}" .else DYNAMIPS_ARCH= "nojit" .endif diff --git a/emulators/dynamips-devel/files/patch-nojit_trans.c b/emulators/dynamips-devel/files/patch-nojit_trans.c index 790c31c2d748..83c0ef37d8cc 100644 --- a/emulators/dynamips-devel/files/patch-nojit_trans.c +++ b/emulators/dynamips-devel/files/patch-nojit_trans.c @@ -4,8 +4,8 @@ EMPTY(void mips64_set_pc(insn_block_t *b,m_uint64_t new_pc)); EMPTY(void mips64_set_ra(insn_block_t *b,m_uint64_t ret_pc)); EMPTY(void mips64_emit_breakpoint(insn_block_t *b)); --EMPTY(int mips64_emit_invalid_delay_slot(insn_block_t *b)); -+EMPTY(void mips64_emit_invalid_delay_slot(insn_block_t *b)); +-EMPTY(void mips64_emit_invalid_delay_slot(insn_block_t *b)); ++EMPTY(int mips64_emit_invalid_delay_slot(insn_block_t *b)); EMPTY(void mips64_inc_cp0_count_reg(insn_block_t *b)); EMPTY(void mips64_check_pending_irq(insn_block_t *b)); EMPTY(void mips64_inc_perf_counter(insn_block_t *b)); diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile index 14cba1cd8be0..6c95a1316dc1 100644 --- a/emulators/dynamips/Makefile +++ b/emulators/dynamips/Makefile @@ -37,10 +37,8 @@ do-install: .include <bsd.port.pre.mk> -.if ${ARCH} == "i386" -DYNAMIPS_ARCH= "x86" -.elif ${ARCH} == "amd64" -DYNAMIPS_ARCH= "nojit" # JIT does not work on amd64 for some reason +.if ${ARCH} == "i386" #|| ${ARCH} == "amd64" +DYNAMIPS_ARCH= "${ARCH}" .else DYNAMIPS_ARCH= "nojit" .endif diff --git a/emulators/dynamips/files/patch-nojit_trans.c b/emulators/dynamips/files/patch-nojit_trans.c index 790c31c2d748..83c0ef37d8cc 100644 --- a/emulators/dynamips/files/patch-nojit_trans.c +++ b/emulators/dynamips/files/patch-nojit_trans.c @@ -4,8 +4,8 @@ EMPTY(void mips64_set_pc(insn_block_t *b,m_uint64_t new_pc)); EMPTY(void mips64_set_ra(insn_block_t *b,m_uint64_t ret_pc)); EMPTY(void mips64_emit_breakpoint(insn_block_t *b)); --EMPTY(int mips64_emit_invalid_delay_slot(insn_block_t *b)); -+EMPTY(void mips64_emit_invalid_delay_slot(insn_block_t *b)); +-EMPTY(void mips64_emit_invalid_delay_slot(insn_block_t *b)); ++EMPTY(int mips64_emit_invalid_delay_slot(insn_block_t *b)); EMPTY(void mips64_inc_cp0_count_reg(insn_block_t *b)); EMPTY(void mips64_check_pending_irq(insn_block_t *b)); EMPTY(void mips64_inc_perf_counter(insn_block_t *b)); |