diff --git a/mach/mantra/int/mloop6 b/mach/mantra/int/mloop6
index dc3ff3fce..bba4eb407 100644
--- a/mach/mantra/int/mloop6
+++ b/mach/mantra/int/mloop6
@@ -93,7 +93,7 @@ mli_2W:
 #else
 		move.l	(sp)+,d0 ;	move.l	(sp)+,d1
 #endif
-4:		clr.w	d5	;	tst.l	d0	;	bpl 5f
+4:		move.l	#0,d5	;	tst.l	d0	;	bpl 5f
 		neg.l	d0	;	not.w	d5
 5:		tst.l	d1	;	bpl	6f
 		neg.l	d1	;	not.w	d5
@@ -189,6 +189,7 @@ rmi_2W:
 		jmp	(a4)
 
 ! 2byte division . In d1: quotient=low word ; remainder=high word
+#ifndef lword
 dvi2:		move.l	(sp)+,d2
 		move.w	(sp)+,d0				!divisor
 		move.w	(sp)+,d1 ;	ext.l	d1		!dividend
@@ -203,6 +204,7 @@ dvi2:		move.l	(sp)+,d2
 #endif
 		divs	d0,d1
 4:		move.l	d2,-(sp) ;	rts
+#endif
 
 ! long signed division . quotient in d1 , remainder in d3
 dvi4:		move.l	(sp)+,d5
@@ -214,7 +216,7 @@ dvi4:		move.l	(sp)+,d5
 0:		bsr	e_iund
 1:
 #endif
-		clr.l	d4			!sign in d4
+		move.l	#0,d4			!sign in d4
 		tst.l	d0	;	bpl	1f
 		neg.l	d0	;	not.w	d4
 1:		tst.l	d1	;	bpl	2f
@@ -238,7 +240,7 @@ dvu4:
 		bsr	e_idivz
 1:
 #endif
-		clr.l	d3	;	move.l	#32,d2
+		move.l	#0,d3	;	move.l	#32,d2
 3:		lsl.l	#1,d1	;	roxl.l	#1,d3
 		cmp.l	d0,d3	;	blt	4f
 		sub.l	d0,d3	;	add.l	#1,d1