From 74ea430004f35a8b3a83f81a3a3a4c78f6041788 Mon Sep 17 00:00:00 2001
From: maxv <maxv@NetBSD.org>
Date: Tue, 1 Aug 2017 14:43:54 +0000
Subject: [PATCH] Move arch/i386/i386/freebsd_* into compat/freebsd/.
 COMPAT_FREEBSD is i386-specific.

---
 sys/arch/i386/conf/files.i386                         |  5 +----
 sys/arch/xen/conf/files.xen                           |  5 +----
 sys/compat/freebsd/files.freebsd                      | 11 ++++++-----
 .../i386/i386 => compat/freebsd}/freebsd_machdep.c    |  4 ++--
 .../i386/i386 => compat/freebsd}/freebsd_sigcode.S    |  4 ++--
 .../i386/i386 => compat/freebsd}/freebsd_syscall.c    |  4 ++--
 sys/modules/compat_freebsd/Makefile                   |  3 +--
 7 files changed, 15 insertions(+), 21 deletions(-)
 rename sys/{arch/i386/i386 => compat/freebsd}/freebsd_machdep.c (97%)
 rename sys/{arch/i386/i386 => compat/freebsd}/freebsd_sigcode.S (96%)
 rename sys/{arch/i386/i386 => compat/freebsd}/freebsd_syscall.c (96%)

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 8f15e8d6186f..6fc9a0ffdc14 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -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"
diff --git a/sys/arch/xen/conf/files.xen b/sys/arch/xen/conf/files.xen
index 05005d923a3c..46c280fed584 100644
--- a/sys/arch/xen/conf/files.xen
+++ b/sys/arch/xen/conf/files.xen
@@ -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
 
diff --git a/sys/compat/freebsd/files.freebsd b/sys/compat/freebsd/files.freebsd
index ec092b8c04d2..b04d1dfba36d 100644
--- a/sys/compat/freebsd/files.freebsd
+++ b/sys/compat/freebsd/files.freebsd
@@ -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
+
diff --git a/sys/arch/i386/i386/freebsd_machdep.c b/sys/compat/freebsd/freebsd_machdep.c
similarity index 97%
rename from sys/arch/i386/i386/freebsd_machdep.c
rename to sys/compat/freebsd/freebsd_machdep.c
index 7e63ba0284f4..d02f7459a526 100644
--- a/sys/arch/i386/i386/freebsd_machdep.c
+++ b/sys/compat/freebsd/freebsd_machdep.c
@@ -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"
diff --git a/sys/arch/i386/i386/freebsd_sigcode.S b/sys/compat/freebsd/freebsd_sigcode.S
similarity index 96%
rename from sys/arch/i386/i386/freebsd_sigcode.S
rename to sys/compat/freebsd/freebsd_sigcode.S
index 83f29963f837..a2cb2c386710 100644
--- a/sys/arch/i386/i386/freebsd_sigcode.S
+++ b/sys/compat/freebsd/freebsd_sigcode.S
@@ -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"
 
diff --git a/sys/arch/i386/i386/freebsd_syscall.c b/sys/compat/freebsd/freebsd_syscall.c
similarity index 96%
rename from sys/arch/i386/i386/freebsd_syscall.c
rename to sys/compat/freebsd/freebsd_syscall.c
index 35fe54e56c79..24b3601e94f6 100644
--- a/sys/arch/i386/i386/freebsd_syscall.c
+++ b/sys/compat/freebsd/freebsd_syscall.c
@@ -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>
diff --git a/sys/modules/compat_freebsd/Makefile b/sys/modules/compat_freebsd/Makefile
index 590b9916207f..279a50e42c53 100644
--- a/sys/modules/compat_freebsd/Makefile
+++ b/sys/modules/compat_freebsd/Makefile
@@ -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