Module Name:    src
Committed By:   maxv
Date:           Tue Aug 15 06:39:37 UTC 2017

Modified Files:
        src/sys/arch/i386/i386: db_machdep.c

Log Message:
Remove __ELF__ vestige.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/i386/db_machdep.c

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

Modified files:

Index: src/sys/arch/i386/i386/db_machdep.c
diff -u src/sys/arch/i386/i386/db_machdep.c:1.5 src/sys/arch/i386/i386/db_machdep.c:1.6
--- src/sys/arch/i386/i386/db_machdep.c:1.5	Sat Jan 11 17:11:50 2014
+++ src/sys/arch/i386/i386/db_machdep.c	Tue Aug 15 06:39:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_machdep.c,v 1.5 2014/01/11 17:11:50 christos Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.6 2017/08/15 06:39:37 maxv Exp $	*/
 
 /* 
  * Mach Operating System
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.5 2014/01/11 17:11:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.6 2017/08/15 06:39:37 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -131,7 +131,6 @@ db_frame_info(long *frame, db_addr_t cal
 		 * locations rather than on trap, since some traps
 		 * (e.g., npxdna) don't go through trap()
 		 */
-#ifdef __ELF__
 		if (!strcmp(name, "trap_tss")) {
 			*is_trap = TRAP_TSS;
 			narg = 0;
@@ -158,34 +157,6 @@ db_frame_info(long *frame, db_addr_t cal
 				narg = 0;
 			}
 		}
-#else
-		if (!strcmp(name, "_trap_tss")) {
-			*is_trap = TRAP_TSS;
-			narg = 0;
-		} else if (!strcmp(name, "_trap")) {
-			*is_trap = TRAP;
-			narg = 0;
-		} else if (!strcmp(name, "_syscall")) {
-			*is_trap = SYSCALL;
-			narg = 0;
-		} else if (name[0] == '_' && name[1] == 'X') {
-			if (!strncmp(name, "_Xintr", 6) ||
-			    !strncmp(name, "_Xresume", 8) ||
-			    !strncmp(name, "_Xstray", 7) ||
-			    !strncmp(name, "_Xhold", 6) ||
-			    !strncmp(name, "_Xrecurse", 9) ||
-			    !strcmp(name, "_Xdoreti")) {
-				*is_trap = INTERRUPT;
-				narg = 0;
-			} else if (!strcmp(name, "_Xsoftintr")) {
-				*is_trap = SOFTINTR;
-				narg = 0;
-			} else if (!strncmp(name, "_Xtss_", 6)) {
-				*is_trap = INTERRUPT_TSS;
-				narg = 0;
-			}
-		}
-#endif /* __ELF__ */
 	}
 
 	if (offp != NULL)

Reply via email to