[src/trunk]: src/sys/compat Remove __i386__.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bb401743c2c5
branches:  trunk
changeset: 825981:bb401743c2c5
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Aug 09 18:52:00 2017 +0000

description:
Remove __i386__.

diffstat:

 sys/compat/ibcs2/ibcs2_misc.c |  27 +++++----------------------
 sys/compat/svr4/svr4_exec.h   |  11 +----------
 sys/compat/svr4/svr4_stat.c   |  10 +++-------
 3 files changed, 9 insertions(+), 39 deletions(-)

diffs (125 lines):

diff -r ff43f07cd954 -r bb401743c2c5 sys/compat/ibcs2/ibcs2_misc.c
--- a/sys/compat/ibcs2/ibcs2_misc.c     Wed Aug 09 18:48:53 2017 +0000
+++ b/sys/compat/ibcs2/ibcs2_misc.c     Wed Aug 09 18:52:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ibcs2_misc.c,v 1.114 2017/07/28 15:34:06 riastradh Exp $       */
+/*     $NetBSD: ibcs2_misc.c,v 1.115 2017/08/09 18:55:21 maxv Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.114 2017/07/28 15:34:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.115 2017/08/09 18:55:21 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -135,10 +135,6 @@
 #include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 
-#if defined(__i386__)
-#include <i386/include/reg.h>
-#endif
-
 #include <compat/ibcs2/ibcs2_types.h>
 #include <compat/ibcs2/ibcs2_dirent.h>
 #include <compat/ibcs2/ibcs2_fcntl.h>
@@ -208,29 +204,16 @@
 int
 ibcs2_sys_waitsys(struct lwp *l, const struct ibcs2_sys_waitsys_args *uap, register_t *retval)
 {
-#if defined(__i386__)
        /* {
                syscallarg(int) a1;
                syscallarg(int) a2;
                syscallarg(int) a3;
        } */
-#endif
        int error, options, status, pid;
 
-#if defined(__i386__)
-#define WAITPID_EFLAGS 0x8c4   /* OF, SF, ZF, PF */
-       if ((l->l_md.md_regs->tf_eflags & WAITPID_EFLAGS) == WAITPID_EFLAGS) {
-               /* waitpid */
-               pid = SCARG(uap, a1);
-               options = SCARG(uap, a3);
-       } else {
-#endif
-               /* wait */
-               pid = WAIT_ANY;
-               options = 0;
-#if defined(__i386__)
-       }
-#endif
+       /* wait */
+       pid = WAIT_ANY;
+       options = 0;
 
        error = do_sys_wait(&pid, &status, options, NULL);
        retval[0] = pid;
diff -r ff43f07cd954 -r bb401743c2c5 sys/compat/svr4/svr4_exec.h
--- a/sys/compat/svr4/svr4_exec.h       Wed Aug 09 18:48:53 2017 +0000
+++ b/sys/compat/svr4/svr4_exec.h       Wed Aug 09 18:52:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svr4_exec.h,v 1.28 2009/12/10 14:13:53 matt Exp $       */
+/*     $NetBSD: svr4_exec.h,v 1.29 2017/08/09 18:52:00 maxv Exp $       */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,15 +37,6 @@
  * play with brk(2) a bit more.
  */
 
-#ifdef __i386__
-/*
- * I cannot load the interpreter after the data segment because brk(2)
- * breaks. I have to load it somewhere before. Programs start at
- * 0x08000000 so I load the interpreter far before.
- */
-#define SVR4_INTERP_ADDR       0x01000000
-#endif
-
 #ifdef __m68k__
 /*
  * Here programs load at 0x80000000, so I load the interpreter far before.
diff -r ff43f07cd954 -r bb401743c2c5 sys/compat/svr4/svr4_stat.c
--- a/sys/compat/svr4/svr4_stat.c       Wed Aug 09 18:48:53 2017 +0000
+++ b/sys/compat/svr4/svr4_stat.c       Wed Aug 09 18:52:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svr4_stat.c,v 1.70 2014/08/14 17:29:30 maxv Exp $       */
+/*     $NetBSD: svr4_stat.c,v 1.71 2017/08/09 18:52:00 maxv Exp $       */
 
 /*-
  * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.70 2014/08/14 17:29:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.71 2017/08/09 18:52:00 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -454,8 +454,6 @@
        case SVR4_SI_ISALIST:
 #if defined(__sparc__)
                str = "sparcv9 sparcv9-fsmuld sparcv8 sparcv8-fsmuld sparcv7 sparc";
-#elif defined(__i386__)
-               str = "i386";
 #else
                str = "unknown";
 #endif
@@ -475,9 +473,7 @@
                break;
 
        case SVR4_SI_PLATFORM:
-#if defined(__i386__)
-               str = "i86pc";
-#elif defined(__sparc__)
+#if defined(__sparc__)
                {
                        extern char machine_model[];