Module Name:    src
Committed By:   joerg
Date:           Tue Apr 26 15:51:32 UTC 2011

Modified Files:
        src/sys/arch/evbarm/conf: MPCSA_GENERIC
        src/sys/arch/i386/conf: ALL GENERIC NET4501 XEN3_DOM0 XEN3_DOMU
            files.i386
        src/sys/arch/i386/i386: apmbios.c machdep.c
        src/sys/arch/i386/include: segments.h
        src/sys/arch/macppc/conf: GENERIC MAMBO POWERMAC_G5
        src/sys/arch/powerpc/conf: files.powerpc
        src/sys/arch/powerpc/powerpc: syscall.c
        src/sys/arch/xen/conf: files.xen
        src/sys/conf: files
        src/sys/sys: sysctl.h
        src/usr.bin/kdump: kdump.c setemul.c setemul.h
Removed Files:
        src/sys/arch/bebox/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/evbppc/include: macho_machdep.h
        src/sys/arch/i386/i386: darwin_commpage_machdep.S darwin_machdep.c
            mach_machdep.c mach_sigcode.S mach_syscall.c macho_machdep.c
        src/sys/arch/i386/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/ibmnws/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/macppc/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/mvmeppc/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/ofppc/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/powerpc/include: darwin_machdep.h mach_machdep.h
            macho_machdep.h
        src/sys/arch/powerpc/powerpc: darwin_commpage_machdep.S
            darwin_machdep.c mach_machdep.c mach_sigcode.S mach_syscall.c
            macho_machdep.c
        src/sys/arch/prep/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/rs6000/include: darwin_machdep.h macho_machdep.h
        src/sys/arch/sandpoint/include: darwin_machdep.h macho_machdep.h
        src/sys/compat/darwin: Makefile darwin_attr.c darwin_attr.h
            darwin_audit.c darwin_audit.h darwin_commpage.c darwin_commpage.h
            darwin_exec.c darwin_exec.h darwin_ioctl.c darwin_ioctl.h
            darwin_ioframebuffer.c darwin_ioframebuffer.h darwin_iohidsystem.c
            darwin_iohidsystem.h darwin_iokit.c darwin_iokit.h darwin_ktrace.c
            darwin_mman.c darwin_mount.c darwin_mount.h darwin_proc.h
            darwin_ptrace.c darwin_ptrace.h darwin_route.c darwin_route.h
            darwin_signal.c darwin_signal.h darwin_socket.c darwin_socket.h
            darwin_stat.c darwin_syscall.h darwin_syscallargs.h
            darwin_syscalls.c darwin_sysctl.c darwin_sysctl.h darwin_sysent.c
            darwin_thread.c darwin_types.h darwin_unistd.c files.darwin
            syscalls.conf syscalls.master
        src/sys/compat/mach: Makefile files.mach mach_bootstrap.c
            mach_bootstrap.h mach_clock.c mach_clock.h mach_errno.c
            mach_errno.h mach_exception.c mach_exception.h mach_exec.c
            mach_exec.h mach_host.c mach_host.h mach_iokit.c mach_iokit.h
            mach_message.c mach_message.h mach_misc.c mach_notify.c
            mach_notify.h mach_port.c mach_port.h mach_semaphore.c
            mach_semaphore.h mach_services.c mach_services.h
            mach_services.master mach_services_names.c mach_syscall.h
            mach_syscallargs.h mach_syscalls.c mach_sysctl.c mach_sysctl.h
            mach_sysent.c mach_task.c mach_task.h mach_thread.c mach_thread.h
            mach_types.h mach_vm.c mach_vm.h makemachservices.sh syscalls.conf
            syscalls.master
        src/sys/compat/mach/arch/powerpc: files.mach_powerpc
        src/sys/compat/mach/arch/powerpc/fasttraps: Makefile
            mach_fasttraps_cpu.c mach_fasttraps_syscall.h
            mach_fasttraps_syscallargs.h mach_fasttraps_syscalls.c
            mach_fasttraps_sysent.c mach_fasttraps_thread.c syscalls.conf
            syscalls.master
        src/sys/compat/mach/arch/powerpc/ppccalls: Makefile
            mach_ppccalls_syscall.h mach_ppccalls_syscallargs.h
            mach_ppccalls_syscalls.c mach_ppccalls_sysent.c syscalls.conf
            syscalls.master
        src/sys/kern: exec_macho.c
        src/sys/sys: exec_macho.h

Log Message:
Remove Darwin, MACH and Mach-O support.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/sys/arch/bebox/include/darwin_machdep.h \
    src/sys/arch/bebox/include/macho_machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.1 -r0 src/sys/arch/evbppc/include/macho_machdep.h
cvs rdiff -u -r1.303 -r1.304 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1029 -r1.1030 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.357 -r1.358 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/i386/apmbios.c
cvs rdiff -u -r1.8 -r0 src/sys/arch/i386/i386/darwin_commpage_machdep.S
cvs rdiff -u -r1.15 -r0 src/sys/arch/i386/i386/darwin_machdep.c
cvs rdiff -u -r1.26 -r0 src/sys/arch/i386/i386/mach_machdep.c
cvs rdiff -u -r1.11 -r0 src/sys/arch/i386/i386/mach_sigcode.S
cvs rdiff -u -r1.35 -r0 src/sys/arch/i386/i386/mach_syscall.c
cvs rdiff -u -r1.701 -r1.702 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/i386/i386/macho_machdep.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/i386/include/darwin_machdep.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/i386/include/macho_machdep.h
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/i386/include/segments.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/ibmnws/include/darwin_machdep.h \
    src/sys/arch/ibmnws/include/macho_machdep.h
cvs rdiff -u -r1.290 -r1.291 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/conf/MAMBO
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/conf/POWERMAC_G5
cvs rdiff -u -r1.1 -r0 src/sys/arch/macppc/include/darwin_machdep.h \
    src/sys/arch/macppc/include/macho_machdep.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/mvmeppc/include/darwin_machdep.h \
    src/sys/arch/mvmeppc/include/macho_machdep.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/ofppc/include/darwin_machdep.h \
    src/sys/arch/ofppc/include/macho_machdep.h
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/powerpc/conf/files.powerpc
cvs rdiff -u -r1.10 -r0 src/sys/arch/powerpc/include/darwin_machdep.h
cvs rdiff -u -r1.5 -r0 src/sys/arch/powerpc/include/mach_machdep.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/powerpc/include/macho_machdep.h
cvs rdiff -u -r1.10 -r0 \
    src/sys/arch/powerpc/powerpc/darwin_commpage_machdep.S
cvs rdiff -u -r1.30 -r0 src/sys/arch/powerpc/powerpc/darwin_machdep.c
cvs rdiff -u -r1.31 -r0 src/sys/arch/powerpc/powerpc/mach_machdep.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/powerpc/powerpc/mach_sigcode.S
cvs rdiff -u -r1.9 -r0 src/sys/arch/powerpc/powerpc/mach_syscall.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/powerpc/powerpc/macho_machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/powerpc/powerpc/syscall.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/prep/include/darwin_machdep.h \
    src/sys/arch/prep/include/macho_machdep.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/rs6000/include/darwin_machdep.h \
    src/sys/arch/rs6000/include/macho_machdep.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/sandpoint/include/darwin_machdep.h \
    src/sys/arch/sandpoint/include/macho_machdep.h
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.5 -r0 src/sys/compat/darwin/Makefile \
    src/sys/compat/darwin/darwin_attr.h src/sys/compat/darwin/darwin_audit.h
cvs rdiff -u -r1.27 -r0 src/sys/compat/darwin/darwin_attr.c
cvs rdiff -u -r1.9 -r0 src/sys/compat/darwin/darwin_audit.c
cvs rdiff -u -r1.15 -r0 src/sys/compat/darwin/darwin_commpage.c
cvs rdiff -u -r1.7 -r0 src/sys/compat/darwin/darwin_commpage.h \
    src/sys/compat/darwin/darwin_socket.h
cvs rdiff -u -r1.62 -r0 src/sys/compat/darwin/darwin_exec.c
cvs rdiff -u -r1.17 -r0 src/sys/compat/darwin/darwin_exec.h \
    src/sys/compat/darwin/darwin_thread.c
cvs rdiff -u -r1.12 -r0 src/sys/compat/darwin/darwin_ioctl.c \
    src/sys/compat/darwin/darwin_unistd.c
cvs rdiff -u -r1.3 -r0 src/sys/compat/darwin/darwin_ioctl.h \
    src/sys/compat/darwin/darwin_iokit.c \
    src/sys/compat/darwin/darwin_ptrace.h src/sys/compat/darwin/syscalls.conf
cvs rdiff -u -r1.44 -r0 src/sys/compat/darwin/darwin_ioframebuffer.c
cvs rdiff -u -r1.13 -r0 src/sys/compat/darwin/darwin_ioframebuffer.h \
    src/sys/compat/darwin/darwin_ktrace.c
cvs rdiff -u -r1.43 -r0 src/sys/compat/darwin/darwin_iohidsystem.c
cvs rdiff -u -r1.16 -r0 src/sys/compat/darwin/darwin_iohidsystem.h \
    src/sys/compat/darwin/darwin_route.c \
    src/sys/compat/darwin/darwin_signal.h src/sys/compat/darwin/darwin_stat.c
cvs rdiff -u -r1.10 -r0 src/sys/compat/darwin/darwin_iokit.h
cvs rdiff -u -r1.32 -r0 src/sys/compat/darwin/darwin_mman.c
cvs rdiff -u -r1.20 -r0 src/sys/compat/darwin/darwin_mount.c
cvs rdiff -u -r1.4 -r0 src/sys/compat/darwin/darwin_mount.h
cvs rdiff -u -r1.8 -r0 src/sys/compat/darwin/darwin_proc.h
cvs rdiff -u -r1.19 -r0 src/sys/compat/darwin/darwin_ptrace.c
cvs rdiff -u -r1.6 -r0 src/sys/compat/darwin/darwin_route.h \
    src/sys/compat/darwin/darwin_types.h
cvs rdiff -u -r1.31 -r0 src/sys/compat/darwin/darwin_signal.c
cvs rdiff -u -r1.21 -r0 src/sys/compat/darwin/darwin_socket.c
cvs rdiff -u -r1.59 -r0 src/sys/compat/darwin/darwin_syscall.h \
    src/sys/compat/darwin/darwin_syscallargs.h
cvs rdiff -u -r1.60 -r0 src/sys/compat/darwin/darwin_syscalls.c \
    src/sys/compat/darwin/darwin_sysent.c
cvs rdiff -u -r1.65 -r0 src/sys/compat/darwin/darwin_sysctl.c
cvs rdiff -u -r1.11 -r0 src/sys/compat/darwin/darwin_sysctl.h
cvs rdiff -u -r1.22 -r0 src/sys/compat/darwin/files.darwin
cvs rdiff -u -r1.40 -r0 src/sys/compat/darwin/syscalls.master
cvs rdiff -u -r1.7 -r0 src/sys/compat/mach/Makefile \
    src/sys/compat/mach/mach_semaphore.h
cvs rdiff -u -r1.16 -r0 src/sys/compat/mach/files.mach \
    src/sys/compat/mach/mach_services_names.c src/sys/compat/mach/mach_task.h
cvs rdiff -u -r1.14 -r0 src/sys/compat/mach/mach_bootstrap.c \
    src/sys/compat/mach/mach_exception.c
cvs rdiff -u -r1.5 -r0 src/sys/compat/mach/mach_bootstrap.h
cvs rdiff -u -r1.19 -r0 src/sys/compat/mach/mach_clock.c \
    src/sys/compat/mach/mach_semaphore.c src/sys/compat/mach/mach_services.c \
    src/sys/compat/mach/mach_services.h src/sys/compat/mach/mach_thread.h
cvs rdiff -u -r1.8 -r0 src/sys/compat/mach/mach_clock.h \
    src/sys/compat/mach/mach_exception.h \
    src/sys/compat/mach/makemachservices.sh
cvs rdiff -u -r1.18 -r0 src/sys/compat/mach/mach_errno.c
cvs rdiff -u -r1.9 -r0 src/sys/compat/mach/mach_errno.h
cvs rdiff -u -r1.74 -r0 src/sys/compat/mach/mach_exec.c
cvs rdiff -u -r1.35 -r0 src/sys/compat/mach/mach_exec.h
cvs rdiff -u -r1.31 -r0 src/sys/compat/mach/mach_host.c
cvs rdiff -u -r1.17 -r0 src/sys/compat/mach/mach_host.h
cvs rdiff -u -r1.36 -r0 src/sys/compat/mach/mach_iokit.c
cvs rdiff -u -r1.26 -r0 src/sys/compat/mach/mach_iokit.h
cvs rdiff -u -r1.59 -r0 src/sys/compat/mach/mach_message.c
cvs rdiff -u -r1.30 -r0 src/sys/compat/mach/mach_message.h \
    src/sys/compat/mach/mach_vm.h
cvs rdiff -u -r1.28 -r0 src/sys/compat/mach/mach_misc.c
cvs rdiff -u -r1.20 -r0 src/sys/compat/mach/mach_notify.c
cvs rdiff -u -r1.10 -r0 src/sys/compat/mach/mach_notify.h \
    src/sys/compat/mach/syscalls.master
cvs rdiff -u -r1.66 -r0 src/sys/compat/mach/mach_port.c
cvs rdiff -u -r1.40 -r0 src/sys/compat/mach/mach_port.h
cvs rdiff -u -r1.13 -r0 src/sys/compat/mach/mach_services.master
cvs rdiff -u -r1.21 -r0 src/sys/compat/mach/mach_syscall.h \
    src/sys/compat/mach/mach_syscallargs.h
cvs rdiff -u -r1.22 -r0 src/sys/compat/mach/mach_syscalls.c
cvs rdiff -u -r1.4 -r0 src/sys/compat/mach/mach_sysctl.c
cvs rdiff -u -r1.3 -r0 src/sys/compat/mach/mach_sysctl.h
cvs rdiff -u -r1.23 -r0 src/sys/compat/mach/mach_sysent.c
cvs rdiff -u -r1.72 -r0 src/sys/compat/mach/mach_task.c
cvs rdiff -u -r1.50 -r0 src/sys/compat/mach/mach_thread.c
cvs rdiff -u -r1.24 -r0 src/sys/compat/mach/mach_types.h
cvs rdiff -u -r1.62 -r0 src/sys/compat/mach/mach_vm.c
cvs rdiff -u -r1.2 -r0 src/sys/compat/mach/syscalls.conf
cvs rdiff -u -r1.1 -r0 src/sys/compat/mach/arch/powerpc/files.mach_powerpc
cvs rdiff -u -r1.5 -r0 src/sys/compat/mach/arch/powerpc/fasttraps/Makefile
cvs rdiff -u -r1.8 -r0 \
    src/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_cpu.c \
    src/sys/compat/mach/arch/powerpc/fasttraps/syscalls.master
cvs rdiff -u -r1.13 -r0 \
    src/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscall.h \
    src/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h
cvs rdiff -u -r1.14 -r0 \
    src/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscalls.c \
    src/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_sysent.c
cvs rdiff -u -r1.12 -r0 \
    src/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c
cvs rdiff -u -r1.1 -r0 \
    src/sys/compat/mach/arch/powerpc/fasttraps/syscalls.conf
cvs rdiff -u -r1.4 -r0 src/sys/compat/mach/arch/powerpc/ppccalls/Makefile
cvs rdiff -u -r1.8 -r0 \
    src/sys/compat/mach/arch/powerpc/ppccalls/mach_ppccalls_syscall.h \
    src/sys/compat/mach/arch/powerpc/ppccalls/mach_ppccalls_syscallargs.h
cvs rdiff -u -r1.9 -r0 \
    src/sys/compat/mach/arch/powerpc/ppccalls/mach_ppccalls_syscalls.c \
    src/sys/compat/mach/arch/powerpc/ppccalls/mach_ppccalls_sysent.c
cvs rdiff -u -r1.1 -r0 \
    src/sys/compat/mach/arch/powerpc/ppccalls/syscalls.conf
cvs rdiff -u -r1.5 -r0 \
    src/sys/compat/mach/arch/powerpc/ppccalls/syscalls.master
cvs rdiff -u -r1.1007 -r1.1008 src/sys/conf/files
cvs rdiff -u -r1.45 -r0 src/sys/kern/exec_macho.c
cvs rdiff -u -r1.21 -r0 src/sys/sys/exec_macho.h
cvs rdiff -u -r1.192 -r1.193 src/sys/sys/sysctl.h
cvs rdiff -u -r1.109 -r1.110 src/usr.bin/kdump/kdump.c
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/kdump/setemul.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/kdump/setemul.h

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/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.19 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.20
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.19	Sun Mar  6 17:08:22 2011
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC	Tue Apr 26 15:51:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.19 2011/03/06 17:08:22 bouyer Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.20 2011/04/26 15:51:22 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.19 $"
+#ident 		"GENERIC-$Revision: 1.20 $"
 
 maxusers	32		# estimated number of users
 
@@ -119,9 +119,6 @@
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-#options 	COMPAT_MACH	# binary compatibility with Mach binaries
-#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
-#options 	EXEC_MACHO	# exec MACH-O binaries
 #options 	COMPAT_NDIS	# NDIS network driver
 #options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.303 src/sys/arch/i386/conf/ALL:1.304
--- src/sys/arch/i386/conf/ALL:1.303	Mon Apr  4 17:09:39 2011
+++ src/sys/arch/i386/conf/ALL	Tue Apr 26 15:51:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.303 2011/04/04 17:09:39 bouyer Exp $
+# $NetBSD: ALL,v 1.304 2011/04/26 15:51:22 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.303 $"
+#ident 		"ALL-$Revision: 1.304 $"
 
 maxusers	64		# estimated number of users
 
@@ -150,9 +150,6 @@
 options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-options 	COMPAT_MACH	# binary compatibility with Mach binaries
-options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
-options 	EXEC_MACHO	# exec MACH-O binaries
 options 	COMPAT_NDIS	# NDIS network driver
 options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
@@ -1944,7 +1941,6 @@
 options DEBUG_COFF
 options DEBUG_CP0_ACCESS
 options DEBUG_CURSOR
-options DEBUG_DARWIN
 options DEBUG_DDB
 options DEBUG_DR
 options DEBUG_EMUL
@@ -1972,12 +1968,6 @@
 options DEBUG_LED
 options DEBUG_LINUX
 options DEBUG_LINUX_FUTEX
-options DEBUG_MACH
-options DEBUG_MACHFB 
-options DEBUG_MACHO
-options DEBUG_MACH_MSG
-options DEBUG_MACH_RIGHT
-options DEBUG_MACH_VM
 options DEBUG_MEMLOAD
 options DEBUG_MEMORY_LIST
 options DEBUG_MEMSIZE

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1029 src/sys/arch/i386/conf/GENERIC:1.1030
--- src/sys/arch/i386/conf/GENERIC:1.1029	Mon Apr  4 17:09:39 2011
+++ src/sys/arch/i386/conf/GENERIC	Tue Apr 26 15:51:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1029 2011/04/04 17:09:39 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1030 2011/04/26 15:51:22 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1029 $"
+#ident 		"GENERIC-$Revision: 1.1030 $"
 
 maxusers	64		# estimated number of users
 
@@ -151,9 +151,6 @@
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-#options 	COMPAT_MACH	# binary compatibility with Mach binaries
-#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
-#options 	EXEC_MACHO	# exec MACH-O binaries
 #options 	COMPAT_NDIS	# NDIS network driver
 #options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.

Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.73 src/sys/arch/i386/conf/NET4501:1.74
--- src/sys/arch/i386/conf/NET4501:1.73	Sun Mar  6 17:08:26 2011
+++ src/sys/arch/i386/conf/NET4501	Tue Apr 26 15:51:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.73 2011/03/06 17:08:26 bouyer Exp $
+# $NetBSD: NET4501,v 1.74 2011/04/26 15:51:22 joerg Exp $
 #
 # NET4501 -- kernel configuration for a Soekris Engineering net4501
 # single-board computer.
@@ -10,7 +10,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"NET4501-$Revision: 1.73 $"
+#ident 		"NET4501-$Revision: 1.74 $"
 
 maxusers	32		# estimated number of users
 
@@ -97,8 +97,6 @@
 #options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 #options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-#options 	COMPAT_MACH	# binary compatibility with Mach binaries
-#options 	EXEC_MACHO	# exec MACH-O binaries
 #options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 

Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.48 src/sys/arch/i386/conf/XEN3_DOM0:1.49
--- src/sys/arch/i386/conf/XEN3_DOM0:1.48	Mon Apr 18 01:36:25 2011
+++ src/sys/arch/i386/conf/XEN3_DOM0	Tue Apr 26 15:51:22 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3_DOM0,v 1.48 2011/04/18 01:36:25 jym Exp $
+#	$NetBSD: XEN3_DOM0,v 1.49 2011/04/26 15:51:22 joerg Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -94,9 +94,6 @@
 options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-#options 	COMPAT_MACH	# binary compatibility with Mach binaries
-#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
-#options 	EXEC_MACHO	# exec MACH-O binaries
 #options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 

Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.31 src/sys/arch/i386/conf/XEN3_DOMU:1.32
--- src/sys/arch/i386/conf/XEN3_DOMU:1.31	Mon Apr 18 01:36:25 2011
+++ src/sys/arch/i386/conf/XEN3_DOMU	Tue Apr 26 15:51:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.31 2011/04/18 01:36:25 jym Exp $
+# $NetBSD: XEN3_DOMU,v 1.32 2011/04/26 15:51:23 joerg Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -80,9 +80,6 @@
 options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-#options 	COMPAT_MACH	# binary compatibility with Mach binaries
-#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
-#options 	EXEC_MACHO	# exec MACH-O binaries
 #options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 

Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.357 src/sys/arch/i386/conf/files.i386:1.358
--- src/sys/arch/i386/conf/files.i386:1.357	Sun Apr 10 20:36:48 2011
+++ src/sys/arch/i386/conf/files.i386	Tue Apr 26 15:51:23 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.357 2011/04/10 20:36:48 christos Exp $
+#	$NetBSD: files.i386,v 1.358 2011/04/26 15:51:23 joerg Exp $
 #
 # new style config file for i386 architecture
 #
@@ -360,18 +360,6 @@
 file	arch/i386/i386/svr4_sigcode.S		compat_svr4
 file	arch/i386/i386/svr4_syscall.c		compat_svr4
 
-# MACH binary compatibility (COMPAT_MACH)
-include	"compat/mach/files.mach"
-file	arch/i386/i386/mach_machdep.c		compat_mach | compat_darwin
-file	arch/i386/i386/mach_sigcode.S		compat_mach | compat_darwin
-file	arch/i386/i386/mach_syscall.c		compat_mach | compat_darwin
-file	arch/i386/i386/darwin_commpage_machdep.S compat_darwin
-file	arch/i386/i386/macho_machdep.c		exec_macho
-
-# DARWIN binary compatibility (COMPAT_DARWIN)
-include	"compat/darwin/files.darwin"
-file	arch/i386/i386/darwin_machdep.c		compat_darwin
-
 # iBCS-2 binary compatibility (COMPAT_IBCS2)
 include	"compat/ibcs2/files.ibcs2"
 file	arch/i386/i386/ibcs2_machdep.c		compat_ibcs2

Index: src/sys/arch/i386/i386/apmbios.c
diff -u src/sys/arch/i386/i386/apmbios.c:1.17 src/sys/arch/i386/i386/apmbios.c:1.18
--- src/sys/arch/i386/i386/apmbios.c:1.17	Wed Apr 28 19:17:03 2010
+++ src/sys/arch/i386/i386/apmbios.c	Tue Apr 26 15:51:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: apmbios.c,v 1.17 2010/04/28 19:17:03 dyoung Exp $ */
+/*	$NetBSD: apmbios.c,v 1.18 2011/04/26 15:51:23 joerg Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apmbios.c,v 1.17 2010/04/28 19:17:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apmbios.c,v 1.18 2011/04/26 15:51:23 joerg Exp $");
 
 #include "opt_apm.h"
-#include "opt_compat_mach.h"	/* Needed to get the right segment def */
 
 #ifdef APM_NOIDLE
 #error APM_NOIDLE option deprecated; use APM_NO_IDLE instead

Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.701 src/sys/arch/i386/i386/machdep.c:1.702
--- src/sys/arch/i386/i386/machdep.c:1.701	Fri Mar  4 22:25:26 2011
+++ src/sys/arch/i386/i386/machdep.c	Tue Apr 26 15:51:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.701 2011/03/04 22:25:26 joerg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.702 2011/04/26 15:51:23 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,11 +67,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.701 2011/03/04 22:25:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.702 2011/04/26 15:51:23 joerg Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
-#include "opt_compat_mach.h"	/* need to get the right segment def */
 #include "opt_compat_netbsd.h"
 #include "opt_compat_svr4.h"
 #include "opt_cpureset_delay.h"
@@ -1116,9 +1115,6 @@
 extern vector IDTVEC(svr4_fasttrap);
 void (*svr4_fasttrap_vec)(void) = (void (*)(void))nullop;
 krwlock_t svr4_fasttrap_lock;
-#ifdef COMPAT_MACH
-extern vector IDTVEC(mach_trap);
-#endif
 #ifdef XEN
 #define MAX_XEN_IDT 128
 trap_info_t xen_idt[MAX_XEN_IDT];
@@ -1153,10 +1149,6 @@
 	    SDT_MEMERA, SEL_UPL, 1, 1);
 	setsegment(&gdt[GUDATA_SEL].sd, 0, 0xfffff,
 	    SDT_MEMRWA, SEL_UPL, 1, 1);
-#ifdef COMPAT_MACH
-	setgate(&gdt[GMACHCALLS_SEL].gd, &IDTVEC(mach_trap), 1,
-	    SDT_SYS386CGT, SEL_UPL, GSEL(GCODE_SEL, SEL_KPL));
-#endif
 #if NBIOSCALL > 0
 	/* bios trampoline GDT entries */
 	setsegment(&gdt[GBIOSCODE_SEL].sd, 0, 0xfffff, SDT_MEMERA, SEL_KPL, 0,

Index: src/sys/arch/i386/include/segments.h
diff -u src/sys/arch/i386/include/segments.h:1.53 src/sys/arch/i386/include/segments.h:1.54
--- src/sys/arch/i386/include/segments.h:1.53	Sun May 17 18:24:23 2009
+++ src/sys/arch/i386/include/segments.h	Tue Apr 26 15:51:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: segments.h,v 1.53 2009/05/17 18:24:23 bouyer Exp $	*/
+/*	$NetBSD: segments.h,v 1.54 2011/04/26 15:51:23 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -307,7 +307,6 @@
 #define	GUDATA_SEL	4	/* User data descriptor */
 #define	GLDT_SEL	5	/* Default LDT descriptor */
 #define GCPU_SEL	6	/* per-CPU segment */
-#define	GMACHCALLS_SEL	7	/* Darwin (mach trap) system call gate */
 #define	GEXTBIOSDATA_SEL 8	/* magic to catch BIOS refs to EBDA */
 #define	GAPM32CODE_SEL	9	/* 3 APM segments must be consecutive */
 #define	GAPM16CODE_SEL	10	/* and in the specified order: code32 */

Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.290 src/sys/arch/macppc/conf/GENERIC:1.291
--- src/sys/arch/macppc/conf/GENERIC:1.290	Tue Mar 15 23:27:47 2011
+++ src/sys/arch/macppc/conf/GENERIC	Tue Apr 26 15:51:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.290 2011/03/15 23:27:47 riz Exp $
+# $NetBSD: GENERIC,v 1.291 2011/04/26 15:51:24 joerg Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.290 $"
+#ident 		"GENERIC-$Revision: 1.291 $"
 
 maxusers	32
 
@@ -79,11 +79,6 @@
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	COMPAT_LINUX	# Linux binary compatibility
-#options 	COMPAT_DARWIN	# Darwin binary compatibility (experimental)
-#options 	COMPAT_MACH	# Mach compatibility, needed for COMPAT_DARWIN 
-#options 	EXEC_MACHO	# Mach-O binary support, needed for COMPAT_MACH
-#options 	DEBUG_DARWIN	# COMPAT_DARWIN debugging
-#options 	DEBUG_MACH	# COMPAT_MACH debugging
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 

Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.12 src/sys/arch/macppc/conf/MAMBO:1.13
--- src/sys/arch/macppc/conf/MAMBO:1.12	Sun Mar  6 17:08:27 2011
+++ src/sys/arch/macppc/conf/MAMBO	Tue Apr 26 15:51:24 2011
@@ -6,7 +6,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.12 $"
+#ident 		"GENERIC-$Revision: 1.13 $"
 
 maxusers	32
 
@@ -61,11 +61,6 @@
 options 	COMPAT_43	# and 4.3BSD
 
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
-#options 	COMPAT_DARWIN	# Darwin binary compatibility (experimental)
-#options 	COMPAT_MACH	# Mach compatibility, needed for COMPAT_DARWIN 
-#options 	EXEC_MACHO	# Mach-O binary support, needed for COMPAT_MACH
-#options 	DEBUG_DARWIN	# COMPAT_DARWIN debugging
-#options 	DEBUG_MACH	# COMPAT_MACH debugging
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 

Index: src/sys/arch/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.13 src/sys/arch/macppc/conf/POWERMAC_G5:1.14
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.13	Sun Mar  6 17:08:27 2011
+++ src/sys/arch/macppc/conf/POWERMAC_G5	Tue Apr 26 15:51:24 2011
@@ -50,11 +50,6 @@
 options 	COMPAT_40	# NetBSD 4.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
-#options 	COMPAT_DARWIN	# Darwin binary compatibility (experimental)
-#options 	COMPAT_MACH	# Mach compatibility, needed for COMPAT_DARWIN 
-#options 	EXEC_MACHO	# Mach-O binary support, needed for COMPAT_MACH
-#options 	DEBUG_DARWIN	# COMPAT_DARWIN debugging
-#options 	DEBUG_MACH	# COMPAT_MACH debugging
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 

Index: src/sys/arch/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.74 src/sys/arch/powerpc/conf/files.powerpc:1.75
--- src/sys/arch/powerpc/conf/files.powerpc:1.74	Sat Feb 12 18:23:09 2011
+++ src/sys/arch/powerpc/conf/files.powerpc	Tue Apr 26 15:51:24 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.powerpc,v 1.74 2011/02/12 18:23:09 matt Exp $
+#	$NetBSD: files.powerpc,v 1.75 2011/04/26 15:51:24 joerg Exp $
 
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC OPENPIC_SERIAL_MODE
@@ -74,19 +74,7 @@
 file	arch/powerpc/powerpc/compat_13_machdep.c	compat_13
 file	arch/powerpc/powerpc/compat_16_machdep.c	compat_16
 
-# MACH binary compatibility (COMPAT_MACH)
-include "compat/mach/files.mach"
-include "compat/mach/arch/powerpc/files.mach_powerpc"
-file	arch/powerpc/powerpc/mach_machdep.c		compat_mach
-file	arch/powerpc/powerpc/mach_sigcode.S		compat_mach
-file	arch/powerpc/powerpc/mach_syscall.c		compat_mach
-file	arch/powerpc/powerpc/macho_machdep.c		exec_macho
-
-# Darwin binary compatibility (COMPAT_DARWIN)
-include "compat/darwin/files.darwin"
 include "compat/freebsd/files.freebsd" 
-file	arch/powerpc/powerpc/darwin_machdep.c		compat_darwin
-file	arch/powerpc/powerpc/darwin_commpage_machdep.S	compat_darwin
 
 include "compat/netbsd32/files.netbsd32"
 file	arch/powerpc/powerpc/netbsd32_sigcode.S		compat_netbsd32

Index: src/sys/arch/powerpc/powerpc/syscall.c
diff -u src/sys/arch/powerpc/powerpc/syscall.c:1.47 src/sys/arch/powerpc/powerpc/syscall.c:1.48
--- src/sys/arch/powerpc/powerpc/syscall.c:1.47	Wed Mar 16 21:15:30 2011
+++ src/sys/arch/powerpc/powerpc/syscall.c	Tue Apr 26 15:51:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.47 2011/03/16 21:15:30 matt Exp $	*/
+/*	$NetBSD: syscall.c,v 1.48 2011/04/26 15:51:25 joerg Exp $	*/
 
 /*
  * Copyright (C) 2002 Matt Thomas
@@ -64,7 +64,7 @@
 #define EMULNAME(x)	(x)
 #define EMULNAMEU(x)	(x)
 
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.47 2011/03/16 21:15:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.48 2011/04/26 15:51:25 joerg Exp $");
 
 void
 child_return(void *arg)
@@ -113,9 +113,6 @@
 		l->l_savp->savp_pflags &= ~SAVP_FLAG_DELIVERING;
 #endif
 
-#ifdef COMPAT_MACH
-	if ((callp = mach_syscall_dispatch(&code)) == NULL)
-#endif /* COMPAT_MACH */
 	{
 		switch (code) {
 		case EMULNAMEU(SYS_syscall):
@@ -163,15 +160,6 @@
 		tf->tf_fixreg[FIRSTARG] = rval[0];
 		tf->tf_fixreg[FIRSTARG + 1] = rval[1];
 		tf->tf_cr &= ~0x10000000;
-#ifdef COMPAT_MACH
-		/* 
-		 * For regular system calls, on success,
-		 * the next instruction is skipped 
-		 */
-		if ((tf->tf_fixreg[0] < p->p_emul->e_nsysent)
-		    && (tf->tf_fixreg[0] >= 0))
-			tf->tf_srr0 += 4;
-#endif /* COMPAT_MACH */
 		break;
 	case ERESTART:
 		/*
@@ -225,9 +213,6 @@
 #endif
 
 	realcode = code;
-#ifdef COMPAT_MACH
-	if ((callp = mach_syscall_dispatch(&code)) == NULL)
-#endif /* COMPAT_MACH */
 	{
 		switch (code) {
 		case EMULNAMEU(SYS_syscall):
@@ -279,15 +264,6 @@
 		tf->tf_fixreg[FIRSTARG] = rval[0];
 		tf->tf_fixreg[FIRSTARG + 1] = rval[1];
 		tf->tf_cr &= ~0x10000000;
-#ifdef COMPAT_MACH
-		/* 
-		 * For regular system calls, on success,
-		 * the next instruction is skipped 
-		 */
-		if ((tf->tf_fixreg[0] < p->p_emul->e_nsysent)
-		    && (tf->tf_fixreg[0] >= 0))
-			tf->tf_srr0 += 4;
-#endif /* COMPAT_MACH */
 		break;
 	case ERESTART:
 		/*

Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.116 src/sys/arch/xen/conf/files.xen:1.117
--- src/sys/arch/xen/conf/files.xen:1.116	Mon Apr 18 01:36:25 2011
+++ src/sys/arch/xen/conf/files.xen	Tue Apr 26 15:51:25 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.xen,v 1.116 2011/04/18 01:36:25 jym Exp $
+#	$NetBSD: files.xen,v 1.117 2011/04/26 15:51:25 joerg Exp $
 #	NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #	NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -328,18 +328,6 @@
 file	arch/i386/i386/svr4_sigcode.S		compat_svr4
 file	arch/i386/i386/svr4_syscall.c		compat_svr4
 
-# MACH binary compatibility (COMPAT_MACH)
-include	"compat/mach/files.mach"
-file	arch/i386/i386/mach_machdep.c		compat_mach | compat_darwin
-file	arch/i386/i386/mach_sigcode.S		compat_mach | compat_darwin
-file	arch/i386/i386/mach_syscall.c		compat_mach | compat_darwin
-file    arch/i386/i386/darwin_commpage_machdep.S compat_darwin
-file	arch/i386/i386/macho_machdep.c		exec_macho
-
-# DARWIN binary compatibility (COMPAT_DARWIN)
-include	"compat/darwin/files.darwin"
-file	arch/i386/i386/darwin_machdep.c		compat_darwin
-
 # iBCS-2 binary compatibility (COMPAT_IBCS2)
 include	"compat/ibcs2/files.ibcs2"
 file	arch/i386/i386/ibcs2_machdep.c		compat_ibcs2

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1007 src/sys/conf/files:1.1008
--- src/sys/conf/files:1.1007	Sat Apr  2 04:28:56 2011
+++ src/sys/conf/files	Tue Apr 26 15:51:31 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1007 2011/04/02 04:28:56 rmind Exp $
+#	$NetBSD: files,v 1.1008 2011/04/26 15:51:31 joerg Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -79,7 +79,7 @@
 defflag	opt_revcache.h		NAMECACHE_ENTER_REVERSE
 
 defflag	opt_execfmt.h		EXEC_AOUT EXEC_COFF EXEC_ECOFF EXEC_ELF32
-				EXEC_ELF64 EXEC_MACHO EXEC_SCRIPT
+				EXEC_ELF64 EXEC_SCRIPT
 				EXEC_ELF_NOTELESS
 
 defflag	opt_dkwedge.h		DKWEDGE_AUTODISCOVER
@@ -148,8 +148,6 @@
 defflag				COMPAT_NETBSD32
 defflag				COMPAT_AOUT_M68K: COMPAT_40
 defflag				COMPAT_M68K4K
-defflag				COMPAT_MACH
-defflag				COMPAT_DARWIN
 defflag				COMPAT_VAX1K
 defflag				COMPAT_43
 defflag				COMPAT_PECOFF
@@ -1437,14 +1435,12 @@
 file	kern/bufq_readprio.c		bufq_readprio | new_bufq_strategy
 file	kern/core_elf32.c		exec_elf32
 file	kern/core_elf64.c		exec_elf64
-file	kern/core_netbsd.c		exec_aout | exec_coff |
-					exec_ecoff | exec_macho
+file	kern/core_netbsd.c		exec_aout | exec_coff | exec_ecoff
 file	kern/cnmagic.c
 file	kern/exec_aout.c		exec_aout
 file	kern/exec_ecoff.c		exec_ecoff
 file	kern/exec_elf32.c		exec_elf32
 file	kern/exec_elf64.c		exec_elf64
-file	kern/exec_macho.c		exec_macho
 file	kern/exec_script.c		exec_script
 file	kern/exec_subr.c
 file	kern/init_main.c

Index: src/sys/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.192 src/sys/sys/sysctl.h:1.193
--- src/sys/sys/sysctl.h:1.192	Sat Jan 29 17:35:23 2011
+++ src/sys/sys/sysctl.h	Tue Apr 26 15:51:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctl.h,v 1.192 2011/01/29 17:35:23 matt Exp $	*/
+/*	$NetBSD: sysctl.h,v 1.193 2011/04/26 15:51:32 joerg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -1004,8 +1004,6 @@
  */
 #define	EMUL_LINUX	1
 #define	EMUL_IRIX	2
-#define	EMUL_DARWIN	3
-#define	EMUL_MACH	4
 #define	EMUL_LINUX32	5
 
 #define	EMUL_MAXID	6
@@ -1013,8 +1011,6 @@
 	{ 0, 0 }, \
 	{ "linux", CTLTYPE_NODE }, \
 	{ "irix", CTLTYPE_NODE }, \
-	{ "darwin", CTLTYPE_NODE }, \
-	{ "mach", CTLTYPE_NODE }, \
 	{ "linux32", CTLTYPE_NODE }, \
 }
 

Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.109 src/usr.bin/kdump/kdump.c:1.110
--- src/usr.bin/kdump/kdump.c:1.109	Sun Apr 10 16:06:59 2011
+++ src/usr.bin/kdump/kdump.c	Tue Apr 26 15:51:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kdump.c,v 1.109 2011/04/10 16:06:59 pgoyette Exp $	*/
+/*	$NetBSD: kdump.c,v 1.110 2011/04/26 15:51:32 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)kdump.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: kdump.c,v 1.109 2011/04/10 16:06:59 pgoyette Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.110 2011/04/26 15:51:32 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -238,7 +238,6 @@
 		usage();
 
 	setemul(emul_name, 0, 0);
-	mach_lookup_emul();
 
 	m = malloc(size = 1024);
 	if (m == NULL)
@@ -508,8 +507,7 @@
 	emul_changed = 0;
 
 	if (numeric ||
-	    ((ktr->ktr_code >= emul->nsysnames || ktr->ktr_code < 0) &&
-	    mach_traps_dispatch(&ktr->ktr_code, &emul) == 0)) {
+	    ((ktr->ktr_code >= emul->nsysnames || ktr->ktr_code < 0))) {
 		sys_name = "?";
 		(void)printf("[%d]", ktr->ktr_code);
 	} else {
@@ -625,8 +623,7 @@
 	} else
 		emul = cur_emul;
 
-	if (numeric || ((code >= emul->nsysnames || code < 0 || plain > 1) &&
-	    mach_traps_dispatch(&code, &emul) == 0))
+	if (numeric || ((code >= emul->nsysnames || code < 0 || plain > 1)))
 		(void)printf("[%d] ", code);
 	else
 		(void)printf("%s ", emul->sysnames[code]);
@@ -1035,7 +1032,6 @@
 static void
 ktrmmsg(struct ktr_mmsg *mmsg, int len)
 {
-	const char *service_name;
 	const char *reply;
 	int id;
 
@@ -1047,10 +1043,7 @@
 		reply = "";
 	}
 
-	if ((service_name = mach_service_name(id)) != NULL)
-		printf("%s%s [%d]\n", service_name, reply, mmsg->ktr_id);
-	else
-		printf("unknown service%s [%d]\n", reply, mmsg->ktr_id);
+	printf("unknown service%s [%d]\n", reply, mmsg->ktr_id);
 
 	hexdump_buf(mmsg, len, word_size ? word_size : 4);
 }

Index: src/usr.bin/kdump/setemul.c
diff -u src/usr.bin/kdump/setemul.c:1.26 src/usr.bin/kdump/setemul.c:1.27
--- src/usr.bin/kdump/setemul.c:1.26	Mon Apr 28 20:24:13 2008
+++ src/usr.bin/kdump/setemul.c	Tue Apr 26 15:51:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: setemul.c,v 1.26 2008/04/28 20:24:13 martin Exp $	*/
+/*	$NetBSD: setemul.c,v 1.27 2011/04/26 15:51:32 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: setemul.c,v 1.26 2008/04/28 20:24:13 martin Exp $");
+__RCSID("$NetBSD: setemul.c,v 1.27 2011/04/26 15:51:32 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -87,10 +87,6 @@
 #include "../../sys/compat/irix/irix_syscall.h"
 #include "../../sys/compat/linux/linux_syscall.h"
 #include "../../sys/compat/linux32/linux32_syscall.h"
-#include "../../sys/compat/mach/mach_syscall.h"
-#include "../../sys/compat/darwin/darwin_syscall.h"
-#include "../../sys/compat/mach/arch/powerpc/ppccalls/mach_ppccalls_syscall.h"
-#include "../../sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscall.h"
 #include "../../sys/compat/osf1/osf1_syscall.h"
 #include "../../sys/compat/sunos32/sunos32_syscall.h"
 #include "../../sys/compat/sunos/sunos_syscall.h"
@@ -110,10 +106,6 @@
 #include "../../sys/compat/irix/irix_syscalls.c"
 #include "../../sys/compat/linux/linux_syscalls.c"
 #include "../../sys/compat/linux32/linux32_syscalls.c"
-#include "../../sys/compat/darwin/darwin_syscalls.c"
-#include "../../sys/compat/mach/mach_syscalls.c"
-#include "../../sys/compat/mach/arch/powerpc/ppccalls/mach_ppccalls_syscalls.c"
-#include "../../sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscalls.c"
 #include "../../sys/compat/osf1/osf1_syscalls.c"
 #include "../../sys/compat/sunos/sunos_syscalls.c"
 #include "../../sys/compat/sunos32/sunos32_syscalls.c"
@@ -138,11 +130,6 @@
 #include "../../sys/compat/osf1/osf1_signo.c"
 #include "../../sys/compat/linux/common/linux_signo.c"
 
-/* For Mach services names in MMSG traces */
-#ifndef LETS_GET_SMALL
-#include "../../sys/compat/mach/mach_services_names.c"
-#endif
-
 #define NELEM(a) (sizeof(a) / sizeof(a[0]))
 
 /* static */
@@ -179,24 +166,6 @@
 	  native_to_linux_errno,	NELEM(native_to_linux_errno),
 	  linux_to_native_signo,	NSIG,	EMUL_FLAG_NETBSD32 },
 
-	{ "darwin",	darwin_syscallnames,	DARWIN_SYS_MAXSYSCALL,
-	  NULL,				0,
-	  NULL,				0,	0 },
-
-	{ "mach",	mach_syscallnames,	MACH_SYS_MAXSYSCALL,
-	  NULL,				0,	
-	  NULL,				0,	0 },
-
-	{ "mach ppccalls",	mach_ppccalls_syscallnames,
-	  MACH_PPCCALLS_SYS_MAXSYSCALL,
-	  NULL,				0,	
-	  NULL,				0,	0 },
-
-	{ "mach fasttraps",	mach_fasttraps_syscallnames,
-	  MACH_FASTTRAPS_SYS_MAXSYSCALL,
-	  NULL,				0,	
-	  NULL,				0,	0 },
-
 	{ "osf1",	osf1_syscallnames,	OSF1_SYS_MAXSYSCALL,
 	  native_to_osf1_errno,		NELEM(native_to_osf1_errno),
 	  osf1_to_native_signo,		NSIG,	0 },
@@ -244,10 +213,6 @@
 
 const struct emulation *cur_emul;
 const struct emulation *prev_emul;
-/* Mach emulation require extra emulation contexts */
-static const struct emulation *mach;
-static const struct emulation *mach_ppccalls;
-static const struct emulation *mach_fasttraps;
 
 static const struct emulation *default_emul = &emulations[0];
 
@@ -378,77 +343,3 @@
 	if (ctx)
 		LIST_REMOVE(ctx, ctx_link);
 }
-
-/*
- * Temporarily modify code and emulations to handle Mach traps
- * XXX The define are duplicated from sys/arch/powerpc/include/mach_syscall.c
- */
-#define MACH_FASTTRAPS		0x00007ff0
-#define MACH_PPCCALLS		0x00006000
-#define MACH_ODD_SYSCALL_MASK	0x0000fff0
-int
-mach_traps_dispatch(int *code, const struct emulation **emul)
-{
-	switch (*code & MACH_ODD_SYSCALL_MASK) {
-	case MACH_FASTTRAPS:
-		*emul = mach_fasttraps;
-		*code -= MACH_FASTTRAPS;
-		return 1;
-
-	case MACH_PPCCALLS:
-		*emul = mach_ppccalls;
-		*code -= MACH_PPCCALLS;
-		return 1;
-
-	default:
-		if (*code < 0 && *code > -MACH_SYS_MAXSYSCALL) {
-			*emul = mach;
-			*code = -*code;
-			return 1;
-		}
-		return 0;
-	}
-}
-
-/*
- * Lookup Machs emulations
- */
-void
-mach_lookup_emul(void)
-{
-	const struct emulation *emul_idx;
-
-	for (emul_idx = emulations; emul_idx->name; emul_idx++) {
-		if (strcmp("mach", emul_idx->name) == 0)
-			mach = emul_idx;
-		if (strcmp("mach fasttraps", emul_idx->name) == 0)
-			mach_fasttraps = emul_idx;
-		if (strcmp("mach ppccalls", emul_idx->name) == 0)
-			mach_ppccalls = emul_idx;
-	}
-	if (mach == NULL || mach_fasttraps == NULL || mach_ppccalls == NULL) {
-		errx(1, "Cannot load mach emulations");
-		exit(1);
-	}
-	return;
-}
-
-/* 
- * Find the name of the Mach service responsible to a given message Id
- */
-const char *
-mach_service_name(id)
-	int id;
-{
-	const char *retval = NULL;
-#ifndef LETS_GET_SMALL
-	struct mach_service_name *srv;	
-
-	for (srv = mach_services_names; srv->srv_id; srv++)
-		if (srv->srv_id == id)
-			break;
-	retval = srv->srv_name;
-#endif /* LETS_GET_SMALL */
-
-	return retval;
-}

Index: src/usr.bin/kdump/setemul.h
diff -u src/usr.bin/kdump/setemul.h:1.14 src/usr.bin/kdump/setemul.h:1.15
--- src/usr.bin/kdump/setemul.h:1.14	Mon Apr 28 20:24:13 2008
+++ src/usr.bin/kdump/setemul.h	Tue Apr 26 15:51:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: setemul.h,v 1.14 2008/04/28 20:24:13 martin Exp $	*/
+/*	$NetBSD: setemul.h,v 1.15 2011/04/26 15:51:32 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -81,6 +81,3 @@
 void setemul(const char *, pid_t, int);
 void ectx_sanify(pid_t);
 void ectx_delete(void);
-int mach_traps_dispatch(int *, const struct emulation **);
-void mach_lookup_emul(void);
-const char *mach_service_name(int);

Reply via email to