Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/i386/i386 Remove __ELF__ vestige.



details:   https://anonhg.NetBSD.org/src/rev/f0c4c135f563
branches:  trunk
changeset: 826093:f0c4c135f563
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue Aug 15 06:39:37 2017 +0000

description:
Remove __ELF__ vestige.

diffstat:

 sys/arch/i386/i386/db_machdep.c |  33 ++-------------------------------
 1 files changed, 2 insertions(+), 31 deletions(-)

diffs (61 lines):

diff -r 37ad0cad477a -r f0c4c135f563 sys/arch/i386/i386/db_machdep.c
--- a/sys/arch/i386/i386/db_machdep.c   Tue Aug 15 06:37:50 2017 +0000
+++ b/sys/arch/i386/i386/db_machdep.c   Tue Aug 15 06:39:37 2017 +0000
@@ -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 @@
                 * 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 @@
                                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)



Home | Main Index | Thread Index | Old Index