aboutsummaryrefslogtreecommitdiffstats
path: root/emulators/dynamips-devel
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2006-11-14 12:15:04 +0800
committerfjoe <fjoe@FreeBSD.org>2006-11-14 12:15:04 +0800
commit552703fd4bf7404f71de5a07aff896743616a85b (patch)
tree7228aabed552a8c8b1f0a6520ab1a7b10c07b75b /emulators/dynamips-devel
parentfb592e2fe74ea95e7514a5df65ca386cbc798e9f (diff)
downloadfreebsd-ports-gnome-552703fd4bf7404f71de5a07aff896743616a85b.tar.gz
freebsd-ports-gnome-552703fd4bf7404f71de5a07aff896743616a85b.tar.zst
freebsd-ports-gnome-552703fd4bf7404f71de5a07aff896743616a85b.zip
Oops, worng patch committed.
Diffstat (limited to 'emulators/dynamips-devel')
-rw-r--r--emulators/dynamips-devel/Makefile6
-rw-r--r--emulators/dynamips-devel/files/patch-nojit_trans.c4
2 files changed, 4 insertions, 6 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));