diff --git a/sys/arch/mips/mips/fp.S b/sys/arch/mips/mips/fp.S
index e014aef668e1..5523ce2284b1 100644
--- a/sys/arch/mips/mips/fp.S
+++ b/sys/arch/mips/mips/fp.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fp.S,v 1.12 1999/01/16 09:25:18 nisimura Exp $	*/
+/*	$NetBSD: fp.S,v 1.13 1999/03/30 14:27:56 soda Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -2459,7 +2459,7 @@ get_ft_s_done:
  *
  *----------------------------------------------------------------------------
  */
-ALIAS(get_fs_s)
+XLEAF(get_fs_s)
 	srl	a3, a0, 12 - 2			# get FS field (even regs only)
 	and	a3, a3, 0xF << 2		# mask FS field
 	lw	a3, get_fs_s_tbl(a3)		# switch on register number
@@ -2678,7 +2678,7 @@ get_ft_d_done:
  *
  *----------------------------------------------------------------------------
  */
-ALIAS(get_fs_d)
+XLEAF(get_fs_d)
 	srl	a3, a0, 12 - 2			# get FS field (even regs only)
 	and	a3, a3, 0xF << 2		# mask FS field
 	lw	a3, get_fs_d_tbl(a3)		# switch on register number
@@ -3193,7 +3193,7 @@ LEAF(set_fd_s)
 	sll	t1, t1, 23			# position exponent
 	or	t2, t2, t0
 	or	t2, t2, t1
-ALIAS(set_fd_word)
+XLEAF(set_fd_word)
 	srl	a3, a0, 7 - 2			# get FD field (even regs only)
 	and	a3, a3, 0xF << 2		# mask FT field
 	lw	a3, set_fd_s_tbl(a3)		# switch on register number
diff --git a/sys/arch/mips/mips/locore.S b/sys/arch/mips/mips/locore.S
index a24fdc8bf8ee..6b149fc95571 100644
--- a/sys/arch/mips/mips/locore.S
+++ b/sys/arch/mips/mips/locore.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.66 1999/03/24 05:51:05 mrg Exp $	*/
+/*	$NetBSD: locore.S,v 1.67 1999/03/30 14:27:56 soda Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -136,7 +136,7 @@ LEAF_NOPROFILE(sigcode)
 	syscall
 	break	0			# just in case sigreturn fails
 END(sigcode)
-ALIAS(esigcode)
+XLEAF(esigcode)
 
 #ifdef COMPAT_ULTRIX
 LEAF_NOPROFILE(ultrix_sigcode)
@@ -145,7 +145,7 @@ LEAF_NOPROFILE(ultrix_sigcode)
 	syscall
 	break	0			# just in case sigreturn fails
 END(ultrix_sigcode)
-ALIAS(ultrix_esigcode)
+XLEAF(ultrix_esigcode)
 #endif
 
 /*
@@ -695,7 +695,7 @@ END(suswintr)
  * Fetches a short word of data from the user-space address.
  */
 LEAF(fuword)
-ALIAS(fuiword)
+XLEAF(fuiword)
 	lw	v1, _C_LABEL(curpcb)
 	la	v0, _C_LABEL(fswberr)
 	blt	a0, zero, _C_LABEL(fswberr)
@@ -710,7 +710,7 @@ END(fuword)
  * Fetches a short word of data from the user-space address.
  */
 LEAF(fusword)
-ALIAS(fuisword)
+XLEAF(fuisword)
 	lw	v1, _C_LABEL(curpcb)
 	la	v0, _C_LABEL(fswberr)
 	blt	a0, zero, _C_LABEL(fswberr)
@@ -725,7 +725,7 @@ END(fusword)
  * Fetch a byte from the user's address space.
  */
 LEAF(fubyte)
-ALIAS(fuibyte)
+XLEAF(fuibyte)
 	lw	v1, _C_LABEL(curpcb)
 	la	v0, _C_LABEL(fswberr)
 	blt	a0, zero, _C_LABEL(fswberr)
@@ -772,7 +772,7 @@ END(suiword)
  * Stores a short word of data to the user-space address.
  */
 LEAF(susword)
-ALIAS(suisword)
+XLEAF(suisword)
 	lw	v1, _C_LABEL(curpcb)
 	la	v0, _C_LABEL(fswberr)
 	blt	a0, zero, _C_LABEL(fswberr)
@@ -788,7 +788,7 @@ END(susword)
  * Stores a byte of data to the user-space address.
  */
 LEAF(subyte)
-ALIAS(suibyte)
+XLEAF(suibyte)
 	lw	v1, _C_LABEL(curpcb)
 	la	v0, _C_LABEL(fswberr)
 	blt	a0, zero, _C_LABEL(fswberr)
@@ -832,8 +832,8 @@ END(badaddr)
  */
 LEAF(fswintrberr)
 	nop
-ALIAS(fswberr)
-ALIAS(baderr)
+XLEAF(fswberr)
+XLEAF(baderr)
 	sw	zero, U_PCB_ONFAULT(v1)
 	j	ra
 	li	v0, -1
@@ -857,7 +857,7 @@ bcopy:
  */
 #if BYTE_ORDER == LITTLE_ENDIAN
 LEAF(htonl)				# a0 = 0x11223344, return 0x44332211
-ALIAS(ntohl)
+XLEAF(ntohl)
 	srl	v1, a0, 24		# v1 = 0x00000011
 	sll	v0, a0, 24		# v0 = 0x44000000
 	or	v0, v0, v1
@@ -875,7 +875,7 @@ END(htonl)
  * hostorder = ntohs(netorder)
  */
 LEAF(htons)
-ALIAS(ntohs)
+XLEAF(ntohs)
 	srl	v0, a0, 8
 	and	v0, v0, 0xff
 	sll	v1, a0, 8
@@ -1117,7 +1117,7 @@ END(savefpregs)
  *----------------------------------------------------------------------------
  */
 NESTED(MachFPInterrupt, CALLFRAME_SIZ, ra)
-ALIAS(MachFPTrap)
+XLEAF(MachFPTrap)
 	.mask	0x80000000, -4
 	subu	sp, sp, CALLFRAME_SIZ
 	mfc0	t0, MIPS_COP_0_STATUS
diff --git a/sys/arch/mips/mips/locore_mips3.S b/sys/arch/mips/mips/locore_mips3.S
index dcdc85ddea30..385c2e47bd3d 100644
--- a/sys/arch/mips/mips/locore_mips3.S
+++ b/sys/arch/mips/mips/locore_mips3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_mips3.S,v 1.7 1999/02/22 00:21:39 jonathan Exp $	*/
+/*	$NetBSD: locore_mips3.S,v 1.8 1999/03/30 14:27:56 soda Exp $	*/
 
 /*
  * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -1936,7 +1936,7 @@ END(mips3_InvalidateDCache)
  *----------------------------------------------------------------------------
  */
 LEAF_NOPROFILE(mips3_VCED)
-ALIAS(mips3_VCEI)	/* XXXX */
+XLEAF(mips3_VCEI)	/* XXXX */
 	.set	noat
 	move	k0, AT
 	.set	at