Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Oct 2012 04:30:48 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r242066 - head/sys/conf
Message-ID:  <201210250430.q9P4UmPE073130@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Thu Oct 25 04:30:48 2012
New Revision: 242066
URL: http://svn.freebsd.org/changeset/base/242066

Log:
  Hoist the MI compat_freebsd32 files up into files from files.*.

Modified:
  head/sys/conf/files
  head/sys/conf/files.amd64
  head/sys/conf/files.ia64
  head/sys/conf/files.mips
  head/sys/conf/files.powerpc

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu Oct 25 04:29:21 2012	(r242065)
+++ head/sys/conf/files	Thu Oct 25 04:30:48 2012	(r242066)
@@ -270,6 +270,10 @@ cddl/contrib/opensolaris/uts/common/zmod
 cddl/contrib/opensolaris/uts/common/zmod/zmod.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/zutil.c			optional zfs compile-with "${ZFS_C}"
+compat/freebsd32/freebsd32_ioctl.c	optional	compat_freebsd32
+compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
+compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
+compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
 contrib/altq/altq/altq_cbq.c	optional altq \
 	compile-with "${NORMAL_C}"
 contrib/altq/altq/altq_cdnr.c	optional altq
@@ -2573,6 +2577,7 @@ kern/clock_if.m			standard
 kern/cpufreq_if.m		standard
 kern/device_if.m		standard
 kern/imgact_elf.c		standard
+kern/imgact_elf32.c		optional	compat_freebsd32
 kern/imgact_shell.c		standard
 kern/inflate.c			optional gzip
 kern/init_main.c		standard

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Thu Oct 25 04:29:21 2012	(r242065)
+++ head/sys/conf/files.amd64	Thu Oct 25 04:30:48 2012	(r242066)
@@ -403,14 +403,9 @@ amd64/ia32/ia32_signal.c	optional	compat
 amd64/ia32/ia32_sigtramp.S	optional	compat_freebsd32
 amd64/ia32/ia32_syscall.c	optional	compat_freebsd32
 amd64/ia32/ia32_misc.c		optional	compat_freebsd32
-compat/freebsd32/freebsd32_ioctl.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
 compat/ia32/ia32_sysvec.c	optional	compat_freebsd32
 compat/linprocfs/linprocfs.c	optional	linprocfs
 compat/linsysfs/linsysfs.c	optional	linsysfs
-kern/imgact_elf32.c		optional	compat_freebsd32
 #
 # Linux/i386 binary support
 #

Modified: head/sys/conf/files.ia64
==============================================================================
--- head/sys/conf/files.ia64	Thu Oct 25 04:29:21 2012	(r242065)
+++ head/sys/conf/files.ia64	Thu Oct 25 04:30:48 2012	(r242066)
@@ -29,10 +29,6 @@ ukbdmap.h			optional	ukbd_dflt_keymap	\
 	clean		"ukbdmap.h"
 #
 cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S	optional zfs compile-with "${ZFS_S}"
-compat/freebsd32/freebsd32_ioctl.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
 compat/ia32/ia32_sysvec.c		optional	compat_freebsd32
 contrib/ia64/libuwx/src/uwx_bstream.c		standard
 contrib/ia64/libuwx/src/uwx_context.c		standard
@@ -119,7 +115,6 @@ ia64/isa/isa_dma.c		optional	isa
 ia64/pci/pci_cfgreg.c		optional	pci
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
-kern/imgact_elf32.c		optional	compat_freebsd32
 kern/kern_clocksource.c		standard
 libkern/bcmp.c			standard
 libkern/ffsl.c			standard

Modified: head/sys/conf/files.mips
==============================================================================
--- head/sys/conf/files.mips	Thu Oct 25 04:29:21 2012	(r242065)
+++ head/sys/conf/files.mips	Thu Oct 25 04:30:48 2012	(r242066)
@@ -18,6 +18,7 @@ mips/mips/dump_machdep.c		standard
 mips/mips/elf_machdep.c			standard
 mips/mips/exception.S			standard
 mips/mips/fp.S				standard
+mips/mips/freebsd32_machdep.c		optional	compat_freebsd32
 mips/mips/gdb_machdep.c			standard
 mips/mips/in_cksum.c			optional	inet
 mips/mips/libkern_machdep.c		standard
@@ -64,14 +65,6 @@ libkern/memchr.c			optional	fdt
 libkern/memmove.c			standard
 libkern/ucmpdi2.c			optional	mips | mipsel
 
-# Compat32 stuff
-compat/freebsd32/freebsd32_ioctl.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
-kern/imgact_elf32.c			optional	compat_freebsd32
-mips/mips/freebsd32_machdep.c		optional	compat_freebsd32
-
 # cfe support
 dev/cfe/cfe_api.c			optional	cfe
 dev/cfe/cfe_console.c			optional	cfe_console

Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc	Thu Oct 25 04:29:21 2012	(r242065)
+++ head/sys/conf/files.powerpc	Thu Oct 25 04:30:48 2012	(r242066)
@@ -234,10 +234,3 @@ powerpc/wii/wii_pic.c		optional	wii
 powerpc/wii/wii_fb.c		optional	wii
 powerpc/wii/wii_gpio.c		optional	wiigpio
 powerpc/wii/wii_ipc.c		optional	wii
-
-compat/freebsd32/freebsd32_ioctl.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
-compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
-kern/imgact_elf32.c			optional	compat_freebsd32
-



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210250430.q9P4UmPE073130>