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

Move arch/i386/i386/freebsd_* into compat/freebsd/. COMPAT_FREEBSD is

Browse Source 
i386-specific.
This commit is contained in:
maxv 2017-08-01 14:43:54 +00:00
parent eee47c5117
commit 74ea430004
7 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/i386/conf/files.i386
View File

@ -1,4 +1,4 @@
# $NetBSD: files.i386,v 1.382 2017/08/01 13:47:49 maxv Exp $
# $NetBSD: files.i386,v 1.383 2017/08/01 14:43:54 maxv Exp $
#
# new style config file for i386 architecture
#
@ -340,9 +340,6 @@ file arch/x86/x86/linux_trap.c compat_linux
# FreeBSD binary compatibility (COMPAT_FREEBSD)
include "compat/freebsd/files.freebsd"
file arch/i386/i386/freebsd_machdep.c compat_freebsd
file arch/i386/i386/freebsd_sigcode.S compat_freebsd
file arch/i386/i386/freebsd_syscall.c compat_freebsd
# NDIS compatibilty (COMPAT_NDIS)
include "compat/ndis/files.ndis"

5
sys/arch/xen/conf/files.xen
View File

@ -1,4 +1,4 @@
# $NetBSD: files.xen,v 1.151 2017/08/01 13:47:49 maxv Exp $
# $NetBSD: files.xen,v 1.152 2017/08/01 14:43:54 maxv 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
@ -334,9 +334,6 @@ file arch/x86/x86/linux_trap.c compat_linux
# FreeBSD binary compatibility (COMPAT_FREEBSD)
include "compat/freebsd/files.freebsd"
file arch/i386/i386/freebsd_machdep.c compat_freebsd
file arch/i386/i386/freebsd_sigcode.S compat_freebsd
file arch/i386/i386/freebsd_syscall.c compat_freebsd
elifdef amd64

11
sys/compat/freebsd/files.freebsd
View File

@ -1,10 +1,7 @@
# $NetBSD: files.freebsd,v 1.14 2017/07/29 10:39:48 maxv Exp $
# $NetBSD: files.freebsd,v 1.15 2017/08/01 14:43:54 maxv Exp $
#
# Config file description for machine-independent FreeBSD compat code.
# Included by ports that need it.
# ports should define any machine-specific files they need in their
# own file lists.
# Included by ports that need it. Only i386 is supported.
define compat_freebsd
file compat/freebsd/freebsd_exec.c compat_freebsd
@ -13,10 +10,14 @@ file compat/freebsd/freebsd_file.c compat_freebsd
file compat/freebsd/freebsd_fork.c compat_freebsd
file compat/freebsd/freebsd_ioctl.c compat_freebsd
file compat/freebsd/freebsd_ipc.c compat_freebsd
file compat/freebsd/freebsd_machdep.c compat_freebsd
file compat/freebsd/freebsd_misc.c compat_freebsd
file compat/freebsd/freebsd_mod.c compat_freebsd
file compat/freebsd/freebsd_ptrace.c compat_freebsd & ptrace
file compat/freebsd/freebsd_sched.c compat_freebsd
file compat/freebsd/freebsd_sigcode.S compat_freebsd
file compat/freebsd/freebsd_sysctl.c compat_freebsd
file compat/freebsd/freebsd_sysent.c compat_freebsd
file compat/freebsd/freebsd_syscalls.c compat_freebsd
file compat/freebsd/freebsd_syscall.c compat_freebsd

4
sys/arch/i386/i386/freebsd_machdep.c → sys/compat/freebsd/freebsd_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: freebsd_machdep.c,v 1.60 2014/02/23 22:35:27 dsl Exp $ */
/* $NetBSD: freebsd_machdep.c,v 1.1 2017/08/01 14:43:54 maxv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: freebsd_machdep.c,v 1.60 2014/02/23 22:35:27 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: freebsd_machdep.c,v 1.1 2017/08/01 14:43:54 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vm86.h"

4
sys/arch/i386/i386/freebsd_sigcode.S → sys/compat/freebsd/freebsd_sigcode.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: freebsd_sigcode.S,v 1.5 2008/04/28 20:23:24 martin Exp $ */
/* $NetBSD: freebsd_sigcode.S,v 1.1 2017/08/01 14:43:54 maxv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <machine/asm.h>
__KERNEL_RCSID(0, "$NetBSD: freebsd_sigcode.S,v 1.5 2008/04/28 20:23:24 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: freebsd_sigcode.S,v 1.1 2017/08/01 14:43:54 maxv Exp $");
#include "assym.h"

4
sys/arch/i386/i386/freebsd_syscall.c → sys/compat/freebsd/freebsd_syscall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: freebsd_syscall.c,v 1.40 2015/03/07 18:50:01 christos Exp $ */
/* $NetBSD: freebsd_syscall.c,v 1.1 2017/08/01 14:43:54 maxv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.40 2015/03/07 18:50:01 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: freebsd_syscall.c,v 1.1 2017/08/01 14:43:54 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>

3
sys/modules/compat_freebsd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2017/07/29 10:39:48 maxv Exp $
# $NetBSD: Makefile,v 1.5 2017/08/01 14:43:54 maxv Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@ -17,7 +17,6 @@ SRCS+= freebsd_sysctl.c freebsd_sysent.c freebsd_mod.c
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS+= -DEXEC_ELF32
.PATH: ${S}/arch/i386/i386
SRCS+= freebsd_machdep.c freebsd_syscall.c freebsd_sigcode.S
.endif