Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/mips/include/asm.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/mips/include/asm.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.49.2.2
retrieving revision 1.50
diff -u -p -r1.49.2.2 -r1.50
--- src/sys/arch/mips/include/asm.h	2017/03/20 06:57:17	1.49.2.2
+++ src/sys/arch/mips/include/asm.h	2016/08/13 07:52:52	1.50
@@ -1,4 +1,4 @@
-/*	$NetBSD: asm.h,v 1.49.2.2 2017/03/20 06:57:17 pgoyette Exp $	*/
+/*	$NetBSD: asm.h,v 1.50 2016/08/13 07:52:52 skrll Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
 	lw	t9,4(sp);					\
 	addiu	sp,sp,8;					\
 	addiu	t9,t9,40;					\
-	.set	pop;					
+	.set	pop;
 
 #ifdef GPROF
 #define	MCOUNT _KERN_MCOUNT
@@ -504,19 +504,6 @@ _C_LABEL(x):
 #define	REG_SCALESHIFT	3
 #endif
 
-#if (MIPS1 + MIPS2) > 0
-#define	NOP_L		nop
-#else
-#define	NOP_L		/* nothing */
-#endif
-
-/* CPU dependent hook for cp0 load delays */
-#if defined(MIPS1) || defined(MIPS2) || defined(MIPS3)
-#define MFC0_HAZARD	sll $0,$0,1	/* super scalar nop */
-#else
-#define MFC0_HAZARD	/* nothing */
-#endif
-
 #if _MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2 || \
     _MIPS_ISA == _MIPS_ISA_MIPS32
 #define	MFC0		mfc0
@@ -530,7 +517,7 @@ _C_LABEL(x):
 
 #if defined(__mips_o32) || defined(__mips_o64)
 
-#ifdef __mips_abicalls
+#ifdef __ABICALLS__
 #define	CPRESTORE(r)	.cprestore r
 #define	CPLOAD(r)	.cpload r
 #else