Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove IRIX emulation
details: https://anonhg.NetBSD.org/src/rev/846a50b651f6
branches: trunk
changeset: 764531:846a50b651f6
user: joerg <joerg%NetBSD.org@localhost>
date: Tue Apr 26 16:36:40 2011 +0000
description:
Remove IRIX emulation
diffstat:
sys/arch/i386/conf/ALL | 5 +-
sys/arch/mips/conf/files.mips | 5 +-
sys/arch/mips/mips/irix_syscall.c | 38 -
sys/arch/mips/mips/sigcode.S | 6 +-
sys/arch/sgimips/conf/GENERIC32_IP12 | 9 +-
sys/arch/sgimips/conf/GENERIC32_IP2x | 9 +-
sys/arch/sgimips/conf/GENERIC32_IP3x | 9 +-
sys/arch/sgimips/conf/GENERIC64_IP2x | 5 +-
sys/arch/sgimips/conf/GENERIC64_IP3x | 5 +-
sys/arch/sgimips/conf/majors.sgimips | 4 +-
sys/compat/irix/Makefile | 13 -
sys/compat/irix/files.irix | 47 -
sys/compat/irix/irix_dirent.c | 370 -------------
sys/compat/irix/irix_errno.c | 130 ----
sys/compat/irix/irix_errno.h | 215 -------
sys/compat/irix/irix_exec.c | 280 ----------
sys/compat/irix/irix_exec.h | 104 ---
sys/compat/irix/irix_exec_elf32.c | 284 ----------
sys/compat/irix/irix_exec_elf64.c | 5 -
sys/compat/irix/irix_fcntl.c | 372 -------------
sys/compat/irix/irix_fcntl.h | 101 ---
sys/compat/irix/irix_ioctl.c | 178 ------
sys/compat/irix/irix_ioctl.h | 49 -
sys/compat/irix/irix_kmem.c | 132 ----
sys/compat/irix/irix_kmem.h | 49 -
sys/compat/irix/irix_misc.c | 141 -----
sys/compat/irix/irix_mman.c | 268 ---------
sys/compat/irix/irix_mman.h | 52 -
sys/compat/irix/irix_mod.c | 104 ---
sys/compat/irix/irix_mount.c | 105 ---
sys/compat/irix/irix_prctl.c | 949 ----------------------------------
sys/compat/irix/irix_prctl.h | 169 ------
sys/compat/irix/irix_resource.c | 215 -------
sys/compat/irix/irix_resource.h | 63 --
sys/compat/irix/irix_signal.c | 966 -----------------------------------
sys/compat/irix/irix_signal.h | 250 ---------
sys/compat/irix/irix_stat.c | 195 -------
sys/compat/irix/irix_swap.c | 213 -------
sys/compat/irix/irix_swap.h | 95 ---
sys/compat/irix/irix_syscall.h | 443 ----------------
sys/compat/irix/irix_syscallargs.h | 794 ----------------------------
sys/compat/irix/irix_syscalls.c | 286 ----------
sys/compat/irix/irix_sysctl.c | 135 ----
sys/compat/irix/irix_sysctl.h | 83 ---
sys/compat/irix/irix_sysent.c | 567 --------------------
sys/compat/irix/irix_sysmp.c | 194 -------
sys/compat/irix/irix_sysmp.h | 172 ------
sys/compat/irix/irix_syssgi.c | 550 -------------------
sys/compat/irix/irix_syssgi.h | 425 ---------------
sys/compat/irix/irix_systeminfo.c | 167 ------
sys/compat/irix/irix_types.h | 191 ------
sys/compat/irix/irix_usema.c | 717 -------------------------
sys/compat/irix/irix_usema.h | 182 ------
sys/compat/irix/syscalls.conf | 13 -
sys/compat/irix/syscalls.master | 396 --------------
sys/conf/files | 5 +-
sys/kern/kern_exec.c | 5 +-
sys/kern/kern_fork.c | 10 +-
sys/modules/compat_irix/Makefile | 23 -
sys/sys/sysctl.h | 4 +-
usr.bin/kdump/setemul.c | 16 +-
61 files changed, 26 insertions(+), 11561 deletions(-)
diffs (truncated from 12097 to 300 lines):
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/i386/conf/ALL Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.304 2011/04/26 15:51:22 joerg Exp $
+# $NetBSD: ALL,v 1.305 2011/04/26 16:36:40 joerg Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.304 $"
+#ident "ALL-$Revision: 1.305 $"
maxusers 64 # estimated number of users
@@ -1959,7 +1959,6 @@
options DEBUG_HPUX
options DEBUG_IBCS2
options DEBUG_IPR_VJ
-options DEBUG_IRIX
options DEBUG_ISAPNP
options DEBUG_ISSIGNAL
options DEBUG_KERNADDR_ACCESS
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/mips/conf/files.mips
--- a/sys/arch/mips/conf/files.mips Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/mips/conf/files.mips Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mips,v 1.68 2011/04/14 05:07:00 cliff Exp $
+# $NetBSD: files.mips,v 1.69 2011/04/26 16:36:40 joerg Exp $
#
defflag opt_cputype.h NOFPU FPEMUL
@@ -94,6 +94,3 @@
include "compat/linux/arch/mips/files.linux_mips"
file arch/mips/mips/linux_trap.c compat_linux
file arch/mips/mips/linux_syscall.c compat_linux
-
-# IRIX compatibility (COMPAT_IRIX) XXX even more experimental
-include "compat/irix/files.irix"
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/mips/mips/irix_syscall.c
--- a/sys/arch/mips/mips/irix_syscall.c Tue Apr 26 15:51:22 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/* $NetBSD: irix_syscall.c,v 1.4 2008/04/28 20:23:28 martin Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Emmanuel Dreyfus.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: irix_syscall.c,v 1.4 2008/04/28 20:23:28 martin Exp $");
-
-#define EMULNAME(x) __CONCAT(irix_,x)
-#define SYSCALL_SHIFT 1000
-
-#include "syscall.c"
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/mips/mips/sigcode.S
--- a/sys/arch/mips/mips/sigcode.S Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/mips/mips/sigcode.S Tue Apr 26 16:36:40 2011 +0000
@@ -1,9 +1,8 @@
-/* $NetBSD: sigcode.S,v 1.3 2005/12/11 12:18:09 christos Exp $ */
+/* $NetBSD: sigcode.S,v 1.4 2011/04/26 16:36:41 joerg Exp $ */
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
#include "opt_compat_linux.h"
-#include "opt_compat_irix.h"
#include <mips/signal.h>
#include <sys/syscall.h>
@@ -13,9 +12,6 @@
#ifdef COMPAT_LINUX
#include <compat/linux/linux_syscall.h>
#endif
-#ifdef COMPAT_IRIX
-#include <compat/irix/irix_syscall.h>
-#endif
#include <mips/asm.h>
#include "assym.h"
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/sgimips/conf/GENERIC32_IP12
--- a/sys/arch/sgimips/conf/GENERIC32_IP12 Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP12 Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP12,v 1.10 2011/03/06 17:08:30 bouyer Exp $
+# $NetBSD: GENERIC32_IP12,v 1.11 2011/04/26 16:36:41 joerg Exp $
#
# GENERIC32_IP12 machine description file
#
@@ -32,7 +32,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.10 $"
+#ident "GENERIC32-IP2x-$Revision: 1.11 $"
maxusers 32
@@ -86,7 +86,6 @@
options COMPAT_50 # NetBSD 5.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#options COMPAT_IRIX # binary compatibility with IRIX
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -283,10 +282,6 @@
# a pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda 4 # coda minicache <-> venus comm.
-# pseudo devices used for IRIX binary compatibility
-#pseudo-device irix_kmem # IRIX /dev/kmem
-#pseudo-device irix_usema # IRIX /dev/usema
-
# Veriexec
#
# a pseudo device needed for veriexec
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/sgimips/conf/GENERIC32_IP2x
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.86 2011/03/06 17:08:30 bouyer Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.87 2011/04/26 16:36:41 joerg Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.86 $"
+#ident "GENERIC32-IP2x-$Revision: 1.87 $"
maxusers 32
@@ -86,7 +86,6 @@
options COMPAT_50 # NetBSD 5.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#options COMPAT_IRIX # binary compatibility with IRIX
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -329,10 +328,6 @@
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda 4 # coda minicache <-> venus comm.
-# pseudo devices used for IRIX binary compatibility
-#pseudo-device irix_kmem # IRIX /dev/kmem
-#pseudo-device irix_usema # IRIX /dev/usema
-
# Veriexec
#
# a pseudo device needed for veriexec
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/sgimips/conf/GENERIC32_IP3x
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.88 2011/03/06 17:08:31 bouyer Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.89 2011/04/26 16:36:41 joerg Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.88 $"
+#ident "GENERIC32_IP3x-$Revision: 1.89 $"
maxusers 32
@@ -79,7 +79,6 @@
options COMPAT_50 # NetBSD 5.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#options COMPAT_IRIX # binary compatibility with IRIX
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -475,10 +474,6 @@
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda 4 # coda minicache <-> venus comm.
-# pseudo devices used for IRIX binary compatibility
-#pseudo-device irix_kmem # IRIX /dev/kmem
-#pseudo-device irix_usema # IRIX /dev/usema
-
# Veriexec
#
# a pseudo device needed for veriexec
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/sgimips/conf/GENERIC64_IP2x
--- a/sys/arch/sgimips/conf/GENERIC64_IP2x Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/sgimips/conf/GENERIC64_IP2x Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64_IP2x,v 1.2 2009/12/14 00:46:12 matt Exp $
+# $NetBSD: GENERIC64_IP2x,v 1.3 2011/04/26 16:36:41 joerg Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@
no makeoptions TEXTADDR # entry point
makeoptions TEXTADDR=0xffffffff88069000 # entry point
-#ident "GENERIC64-IP2x-$Revision: 1.2 $"
+#ident "GENERIC64-IP2x-$Revision: 1.3 $"
no makeoptions WANT_ECOFF
makeoptions WANT_ECOFF="no" # Create an ECOFF kernel in addition
@@ -45,7 +45,6 @@
#options COMPAT_40 # NetBSD 4.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#options COMPAT_IRIX # binary compatibility with IRIX
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/sgimips/conf/GENERIC64_IP3x
--- a/sys/arch/sgimips/conf/GENERIC64_IP3x Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/sgimips/conf/GENERIC64_IP3x Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64_IP3x,v 1.2 2009/12/14 00:46:12 matt Exp $
+# $NetBSD: GENERIC64_IP3x,v 1.3 2011/04/26 16:36:41 joerg Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@
no makeoptions TEXTADDR
makeoptions TEXTADDR="0xffffffff80069000" # entry point
-#ident "GENERIC64_IP3x-$Revision: 1.2 $"
+#ident "GENERIC64_IP3x-$Revision: 1.3 $"
# Compatibility options
#options COMPAT_15 # NetBSD 1.5
@@ -38,7 +38,6 @@
#options COMPAT_40 # NetBSD 4.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#options COMPAT_IRIX # binary compatibility with IRIX
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
diff -r 5d68fd00c449 -r 846a50b651f6 sys/arch/sgimips/conf/majors.sgimips
--- a/sys/arch/sgimips/conf/majors.sgimips Tue Apr 26 15:51:22 2011 +0000
+++ b/sys/arch/sgimips/conf/majors.sgimips Tue Apr 26 16:36:40 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sgimips,v 1.25 2010/03/06 23:45:40 plunky Exp $
+# $NetBSD: majors.sgimips,v 1.26 2011/04/26 16:36:41 joerg Exp $
#
# Device majors for sgimips
#
@@ -51,8 +51,6 @@
device-major wsfont char 54 wsfont
device-major clockctl char 60 clockctl
-device-major irix_kmem char 61 compat_irix
-device-major irix_usema char 62 compat_irix
device-major audio char 64 audio
device-major pci char 65 pci
device-major irframe char 66 irframedrv
diff -r 5d68fd00c449 -r 846a50b651f6 sys/compat/irix/Makefile
--- a/sys/compat/irix/Makefile Tue Apr 26 15:51:22 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/12/11 12:20:12 christos Exp $
-
-.include <bsd.sys.mk> # for HOST_SH
-
-DEP= syscalls.conf syscalls.master ../../kern/makesyscalls.sh
-OBJS= irix_sysent.c irix_syscalls.c irix_syscall.h irix_syscallargs.h
-
Home |
Main Index |
Thread Index |
Old Index