Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove __i386__.

This commit is contained in:
maxv 2017-08-09 18:52:00 +00:00
parent 47d0937ef0
commit 9f479233db
3 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/compat/ibcs2/ibcs2_misc.c
View File

@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.114 2017/07/28 15:34:06 riastradh E
#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 @@ ibcs2_sys_ulimit(struct lwp *l, const struct ibcs2_sys_ulimit_args *uap, registe
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;

11
sys/compat/svr4/svr4_exec.h
View File

@ -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.

10
sys/compat/svr4/svr4_stat.c
View File

@ -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 @@ svr4_sys_systeminfo(struct lwp *l, const struct svr4_sys_systeminfo_args *uap, r
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 @@ svr4_sys_systeminfo(struct lwp *l, const struct svr4_sys_systeminfo_args *uap, r
break;
case SVR4_SI_PLATFORM:
#if defined(__i386__)
str = "i86pc";
#elif defined(__sparc__)
#if defined(__sparc__)
{
extern char machine_model[];