summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorgrehan <grehan@FreeBSD.org>2012-04-26 07:52:28 +0000
committergrehan <grehan@FreeBSD.org>2012-04-26 07:52:28 +0000
commit94d2b7f64912987093f1a98573737a32e4e5d8d1 (patch)
tree66e8b09d104ddfb3e858eb44c5eb480e59c57a35 /sys/conf
parentbd54a55c5a9baae09ba63f311e15c0d30f9ca683 (diff)
parent142e6644f17b2708b0c7ec8b0fcf34854b02f408 (diff)
downloadFreeBSD-src-94d2b7f64912987093f1a98573737a32e4e5d8d1.zip
FreeBSD-src-94d2b7f64912987093f1a98573737a32e4e5d8d1.tar.gz
IFC @ r234692
sys/amd64/include/cpufunc.h sys/amd64/include/fpu.h sys/amd64/amd64/fpu.c sys/amd64/vmm/vmm.c - Add API to allow vmm FPU state init/save/restore. FP stuff discussed with: kib
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.amd6411
-rw-r--r--sys/conf/Makefile.i3867
-rw-r--r--sys/conf/Makefile.mips4
-rw-r--r--sys/conf/NOTES53
-rw-r--r--sys/conf/WITHOUT_SOURCELESS7
-rw-r--r--sys/conf/WITHOUT_SOURCELESS_HOST10
-rw-r--r--sys/conf/WITHOUT_SOURCELESS_UCODE41
-rw-r--r--sys/conf/files547
-rw-r--r--sys/conf/files.amd64121
-rw-r--r--sys/conf/files.arm1
-rw-r--r--sys/conf/files.i386121
-rw-r--r--sys/conf/files.ia641
-rw-r--r--sys/conf/files.mips16
-rw-r--r--sys/conf/files.pc988
-rw-r--r--sys/conf/files.powerpc6
-rw-r--r--sys/conf/files.sparc641
-rw-r--r--sys/conf/kern.mk24
-rw-r--r--sys/conf/kern.post.mk14
-rw-r--r--sys/conf/kern.pre.mk16
-rw-r--r--sys/conf/kmod.mk6
-rw-r--r--sys/conf/ldscript.powerpc6416
-rw-r--r--sys/conf/makeLINT.mk1
-rw-r--r--sys/conf/newvers.sh12
-rw-r--r--sys/conf/options16
-rw-r--r--sys/conf/options.amd645
-rw-r--r--sys/conf/options.arm1
-rw-r--r--sys/conf/options.i3864
-rw-r--r--sys/conf/options.mips7
28 files changed, 791 insertions, 286 deletions
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 5096829..33f146e 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -40,13 +40,12 @@ CFLAGS+= -fno-omit-frame-pointer
MKMODULESENV+= MACHINE=amd64
-.if ${CC:T:Mclang} == "clang"
# XXX: clang integrated-as doesn't grok .codeNN directives yet
-ASM_CFLAGS+= ${.IMPSRC:T:Macpi_wakecode.S:C/^.+$/-no-integrated-as/}
-ASM_CFLAGS+= ${.IMPSRC:T:Mia32_sigtramp.S:C/^.+$/-no-integrated-as/}
-ASM_CFLAGS+= ${.IMPSRC:T:Mlinux32_locore.s:C/^.+$/-no-integrated-as/}
-ASM_CFLAGS+= ${.IMPSRC:T:Mmpboot.S:C/^.+$/-no-integrated-as/}
-.endif
+ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS}
+ASM_CFLAGS.ia32_sigtramp.S= ${CLANG_NO_IAS}
+ASM_CFLAGS.linux32_locore.s= ${CLANG_NO_IAS}
+ASM_CFLAGS.mpboot.S= ${CLANG_NO_IAS}
+ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}}
%BEFORE_DEPEND
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 5ea09d0..538ccbc 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -34,11 +34,10 @@ MACHINE=i386
MKMODULESENV+= MACHINE=${MACHINE}
-.if ${CC:T:Mclang} == "clang"
# XXX: clang integrated-as doesn't grok .codeNN directives yet
-ASM_CFLAGS+= ${.IMPSRC:T:Macpi_wakecode.S:C/^.+$/-no-integrated-as/}
-ASM_CFLAGS+= ${.IMPSRC:T:Mmpboot.s:C/^.+$/-no-integrated-as/}
-.endif
+ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS}
+ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS}
+ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}}
%BEFORE_DEPEND
diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips
index 6928079..69eea9e 100644
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
@@ -44,7 +44,7 @@ MKMODULESENV+= MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
# We default to the MIPS32 ISA, if none specified in the
# kernel configuration file.
ARCH_FLAGS?=-march=mips32
-EXTRA_FLAGS=-fno-pic -mno-abicalls -G0
+EXTRA_FLAGS=-fno-pic -mno-abicalls -G0 -DKERNLOADADDR=${KERNLOADADDR}
HACK_EXTRA_FLAGS=-shared
@@ -63,6 +63,7 @@ TRAMP_ELFSIZE=32
# XXX hardcoded kernel entry point
ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
+.if !defined(WITHOUT_KERNEL_TRAMPOLINE)
KERNEL_EXTRA=trampoline
trampoline: ${KERNEL_KO}.tramp.bin
${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \
@@ -78,6 +79,7 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \
-o ${KERNEL_KO}.tramp.elf
${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.elf \
${KERNEL_KO}.tramp.bin
+.endif
%BEFORE_DEPEND
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 92e8809..889c532 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -159,6 +159,7 @@ options GEOM_PART_BSD # BSD disklabel
options GEOM_PART_EBR # Extended Boot Records
options GEOM_PART_EBR_COMPAT # Backward compatible partition names
options GEOM_PART_GPT # GPT partitioning
+options GEOM_PART_LDM # Logical Disk Manager
options GEOM_PART_MBR # MBR partitioning
options GEOM_PART_PC98 # PC-9800 disk partitioning
options GEOM_PART_VTOC8 # SMI VTOC8 disk label
@@ -219,19 +220,19 @@ options MAXCPU=32
# ADAPTIVE_MUTEXES changes the behavior of blocking mutexes to spin
# if the thread that currently owns the mutex is executing on another
-# CPU. This behaviour is enabled by default, so this option can be used
+# CPU. This behavior is enabled by default, so this option can be used
# to disable it.
options NO_ADAPTIVE_MUTEXES
# ADAPTIVE_RWLOCKS changes the behavior of reader/writer locks to spin
# if the thread that currently owns the rwlock is executing on another
-# CPU. This behaviour is enabled by default, so this option can be used
+# CPU. This behavior is enabled by default, so this option can be used
# to disable it.
options NO_ADAPTIVE_RWLOCKS
# ADAPTIVE_SX changes the behavior of sx locks to spin if the thread that
# currently owns the sx lock is executing on another CPU.
-# This behaviour is enabled by default, so this option can be used to
+# This behavior is enabled by default, so this option can be used to
# disable it.
options NO_ADAPTIVE_SX
@@ -274,6 +275,8 @@ options SX_NOINLINE
# frequency.
# TURNSTILE_PROFILING enables rudimentary profiling of the hash table
# used to hold active lock queues.
+# UMTX_PROFILING enables rudimentary profiling of the hash table used
+ to hold active lock queues.
# WITNESS enables the witness code which detects deadlocks and cycles
# during locking operations.
# WITNESS_KDB causes the witness code to drop into the kernel debugger if
@@ -297,8 +300,9 @@ options MPROF_HASH_SIZE="1543"
# Profiling for internal hash tables.
options SLEEPQUEUE_PROFILING
options TURNSTILE_PROFILING
+options UMTX_PROFILING
+
-
#####################################################################
# COMPATIBILITY OPTIONS
@@ -437,7 +441,7 @@ options KTRACE_REQUEST_POOL=101
# initial value of the ktr_mask variable which determines at runtime
# what events to trace. KTR_CPUMASK determines which CPU's log
# events, with bit X corresponding to CPU X. The layout of the string
-# passed as KTR_CPUMASK must match a serie of bitmasks each of them
+# passed as KTR_CPUMASK must match a series of bitmasks each of them
# separated by the ", " characters (ie:
# KTR_CPUMASK=("0xAF, 0xFFFFFFFFFFFFFFFF")). KTR_VERBOSE enables
# dumping of KTR events to the console by default. This functionality
@@ -602,7 +606,7 @@ options FLOWTABLE
options SCTP
# There are bunches of options:
# this one turns on all sorts of
-# nastly printing that you can
+# nastily printing that you can
# do. It's all controlled by a
# bit mask (settable by socket opt and
# by sysctl). Including will not cause
@@ -1269,7 +1273,7 @@ hint.sa.1.target="6"
# The sg driver provides a passthrough API that is compatible with the
# Linux SG driver. It will work in conjunction with the COMPAT_LINUX
# option to run linux SG apps. It can also stand on its own and provide
-# source level API compatiblity for porting apps to FreeBSD.
+# source level API compatibility for porting apps to FreeBSD.
#
# Target Mode support is provided here but also requires that a SIM
# (SCSI Host Adapter Driver) provide support as well.
@@ -1297,6 +1301,7 @@ device targ #SCSI Target Mode Code
device targbh #SCSI Target Mode Blackhole Device
device pass #CAM passthrough driver
device sg #Linux SCSI passthrough
+device ctl #CAM Target Layer
# CAM OPTIONS:
# debugging options:
@@ -1433,7 +1438,7 @@ options SC_NORM_REV_ATTR=(FG_YELLOW|BG_GREEN)
options SC_KERNEL_CONS_ATTR=(FG_RED|BG_BLACK)
options SC_KERNEL_CONS_REV_ATTR=(FG_BLACK|BG_RED)
-# The following options will let you change the default behaviour of
+# The following options will let you change the default behavior of
# cut-n-paste feature
options SC_CUT_SPACES2TABS # convert leading spaces into tabs
options SC_CUT_SEPCHARS=\"x09\" # set of characters that delimit words
@@ -1711,12 +1716,12 @@ device siis
# For example to build a system which only supports a VIA chipset,
# omit 'ata' and include the 'atacore', 'atapci' and 'atavia' drivers.
device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-device atapicam # emulate ATAPI devices as SCSI ditto via CAM
+#device atadisk # ATA disk drives
+#device ataraid # ATA RAID drives
+#device atapicd # ATAPI CDROM drives
+#device atapifd # ATAPI floppy drives
+#device atapist # ATAPI tape drives
+#device atapicam # emulate ATAPI devices as SCSI ditto via CAM
# needs CAM to be present (scbus & pass)
# Modular ATA
@@ -1834,7 +1839,7 @@ hint.uart.0.baud="115200"
# specifically, the 0x20 flag can also be set (see above).
# Currently, at most one unit can have console support; the
# first one (in config file order) with this flag set is
-# preferred. Setting this flag for sio0 gives the old behaviour.
+# preferred. Setting this flag for sio0 gives the old behavior.
# 0x80 use this port for serial line gdb support in ddb. Also known
# as debug port.
#
@@ -1971,6 +1976,7 @@ device xmphy # XaQti XMAC II
# SMC EZ Card 1000 (SMC9462TX), D-Link DGE-500T, Asante FriendlyNet
# GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the Surecom
# EP-320G-TX and the Netgear GA622T.
+# oce: Emulex 10 Gbit adapters (OneConnect Ethernet)
# pcn: Support for PCI fast ethernet adapters based on the AMD Am79c97x
# PCnet-FAST, PCnet-FAST+, PCnet-FAST III, PCnet-PRO and PCnet-Home
# chipsets. These can also be handled by the le(4) driver if the
@@ -2111,6 +2117,7 @@ device ixgbe # Intel Pro/10Gbe PCIE Ethernet
device le # AMD Am7900 LANCE and Am79C9xx PCnet
device mxge # Myricom Myri-10G 10GbE NIC
device nxge # Neterion Xframe 10GbE Server/Storage Adapter
+device oce # Emulex 10 GbE (OneConnect Ethernet)
device ti # Alteon Networks Tigon I/II gigabit Ethernet
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
@@ -2254,6 +2261,7 @@ device sound
# snd_gusc: Gravis UltraSound ISA PnP/non-PnP.
# snd_hda: Intel High Definition Audio (Controller) and
# compatible.
+# snd_hdspe: RME HDSPe AIO and RayDAT.
# snd_ich: Intel ICH AC'97 and some more audio controllers
# embedded in a chipset, for example nVidia
# nForce controllers.
@@ -2293,6 +2301,7 @@ device snd_ess
device snd_fm801
device snd_gusc
device snd_hda
+device snd_hdspe
device snd_ich
device snd_maestro
device snd_maestro3
@@ -2332,7 +2341,7 @@ hint.gusc.0.flags="0x13"
# sanity checking and possible increase of
# verbosity.
#
-# SND_DIAGNOSTIC Simmilar in a spirit of INVARIANTS/DIAGNOSTIC,
+# SND_DIAGNOSTIC Similar in a spirit of INVARIANTS/DIAGNOSTIC,
# zero tolerance against inconsistencies.
#
# SND_FEEDER_MULTIFORMAT By default, only 16/32 bit feeders are compiled
@@ -2414,18 +2423,18 @@ device cmx
# or
# options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC
# Specifies the default video capture mode.
-# This is required for Dual Crystal (28&35Mhz) boards where PAL is used
-# to prevent hangs during initialisation, e.g. VideoLogic Captivator PCI.
+# This is required for Dual Crystal (28&35MHz) boards where PAL is used
+# to prevent hangs during initialization, e.g. VideoLogic Captivator PCI.
#
# options BKTR_USE_PLL
-# This is required for PAL or SECAM boards with a 28Mhz crystal and no 35Mhz
+# This is required for PAL or SECAM boards with a 28MHz crystal and no 35MHz
# crystal, e.g. some new Bt878 cards.
#
# options BKTR_GPIO_ACCESS
# This enables IOCTLs which give user level access to the GPIO port.
#
# options BKTR_NO_MSP_RESET
-# Prevents the MSP34xx reset. Good if you initialise the MSP in another OS first
+# Prevents the MSP34xx reset. Good if you initialize the MSP in another OS first
#
# options BKTR_430_FX_MODE
# Switch Bt878/879 cards into Intel 430FX chipset compatibility mode.
@@ -2522,6 +2531,7 @@ device smb
# ic i2c network interface
# iic i2c standard io
# iicsmb i2c to smb bridge. Allow i2c i/o with smb commands.
+# iicoc simple polling driver for OpenCores I2C controller
#
# Supported interfaces:
# bktr brooktree848 I2C software interface
@@ -2535,13 +2545,16 @@ device iicbb
device ic
device iic
device iicsmb # smb over i2c bridge
+device iicoc # OpenCores I2C controller support
# I2C peripheral devices
#
# ds133x Dallas Semiconductor DS1337, DS1338 and DS1339 RTC
+# ds1374 Dallas Semiconductor DS1374 RTC
# ds1672 Dallas Semiconductor DS1672 RTC
#
device ds133x
+device ds1374
device ds1672
# Parallel-Port Bus
diff --git a/sys/conf/WITHOUT_SOURCELESS b/sys/conf/WITHOUT_SOURCELESS
new file mode 100644
index 0000000..3425dda
--- /dev/null
+++ b/sys/conf/WITHOUT_SOURCELESS
@@ -0,0 +1,7 @@
+#
+# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
+#
+# $FreeBSD$
+
+include WITHOUT_SOURCELESS_HOST
+include WITHOUT_SOURCELESS_UCODE
diff --git a/sys/conf/WITHOUT_SOURCELESS_HOST b/sys/conf/WITHOUT_SOURCELESS_HOST
new file mode 100644
index 0000000..7775fb8
--- /dev/null
+++ b/sys/conf/WITHOUT_SOURCELESS_HOST
@@ -0,0 +1,10 @@
+#
+# WITHOUT_SOURCELESS_HOST -- Disable drivers that include sourceless
+# native code for host CPU.
+#
+# $FreeBSD$
+
+nodevice hpt27xx
+nodevice hptmv
+nodevice hptrr
+nodevice nve
diff --git a/sys/conf/WITHOUT_SOURCELESS_UCODE b/sys/conf/WITHOUT_SOURCELESS_UCODE
new file mode 100644
index 0000000..3d02c21
--- /dev/null
+++ b/sys/conf/WITHOUT_SOURCELESS_UCODE
@@ -0,0 +1,41 @@
+#
+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
+# microcode.
+#
+# $FreeBSD$
+
+nodevice adw
+nodevice bce
+nodevice fatm
+nodevice fxp
+nodevice ispfw
+nodevice mwlfw
+nodevice ralfw
+nodevice runfw
+nodevice sf
+nodevice sn
+nodevice ti
+nodevice txp
+nodevice ce
+nodevice cp
+nodevice ctau
+nodevice ipwfw
+nodevice iwifw
+nodevice iwnfw
+nodevice wpifw
+
+# drm
+nodevice mga
+nodevice r128
+nodevice radeon
+
+# sound
+nodevice csa
+nodevice ds1
+nodevice maestro3
+
+# usb
+nodevice rum
+nodevice uath
+nodevice zyd
+nodevice kue
diff --git a/sys/conf/files b/sys/conf/files
index 51780df..ecabaa8 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -50,11 +50,6 @@ aic79xx_reg_print.c optional ahd pci \
aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \
compile-with "${NORMAL_C}" \
no-implicit-rule local
-emu10k1-alsa%diked.h optional snd_emu10kx \
- dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
- compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
- no-obj no-implicit-rule before-depend \
- clean "emu10k1-alsa%diked.h"
#
# The 'fdt_dtb_file' target covers an actual DTB file name, which is derived
# from the specified source (DTS) file: <platform>.dts -> <platform>.dtb
@@ -67,16 +62,6 @@ fdt_static_dtb.h optional fdt fdt_dtb_static \
compile-with "sh $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ." \
no-obj no-implicit-rule before-depend \
clean "fdt_static_dtb.h"
-p16v-alsa%diked.h optional snd_emu10kx pci \
- dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \
- compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \
- no-obj no-implicit-rule before-depend \
- clean "p16v-alsa%diked.h"
-p17v-alsa%diked.h optional snd_emu10kx pci \
- dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \
- compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \
- no-obj no-implicit-rule before-depend \
- clean "p17v-alsa%diked.h"
feeder_eq_gen.h optional sound \
dependency "$S/tools/sound/feeder_eq_mkfilter.awk" \
compile-with "${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
@@ -130,6 +115,19 @@ cam/scsi/scsi_all.c optional scbus
cam/scsi/scsi_cd.c optional cd
cam/scsi/scsi_ch.c optional ch
cam/ata/ata_da.c optional ada | da
+cam/ctl/ctl.c optional ctl
+cam/ctl/ctl_backend.c optional ctl
+cam/ctl/ctl_backend_block.c optional ctl
+cam/ctl/ctl_backend_ramdisk.c optional ctl
+cam/ctl/ctl_cmd_table.c optional ctl
+cam/ctl/ctl_frontend.c optional ctl
+cam/ctl/ctl_frontend_cam_sim.c optional ctl
+cam/ctl/ctl_frontend_internal.c optional ctl
+cam/ctl/ctl_mem_pool.c optional ctl
+cam/ctl/ctl_scsi_all.c optional ctl
+cam/ctl/ctl_error.c optional ctl
+cam/ctl/ctl_util.c optional ctl
+cam/ctl/scsi_ctl.c optional ctl
cam/scsi/scsi_da.c optional da
cam/scsi/scsi_low.c optional ct | ncv | nsp | stg
cam/scsi/scsi_low_pisa.c optional ct | ncv | nsp | stg
@@ -141,6 +139,131 @@ cam/scsi/scsi_sg.c optional sg
cam/scsi/scsi_targ_bh.c optional targbh
cam/scsi/scsi_target.c optional targ
cam/scsi/smp_all.c optional scbus
+# shared between zfs and dtrace
+cddl/compat/opensolaris/kern/opensolaris.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_cmn_err.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_kmem.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_misc.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_sunddi.c optional zfs compile-with "${ZFS_C}"
+# zfs specific
+cddl/compat/opensolaris/kern/opensolaris_acl.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_kobj.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_kstat.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_lookup.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_policy.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_string.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_sysevent.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_taskq.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_uio.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_vfs.c optional zfs compile-with "${ZFS_C}"
+cddl/compat/opensolaris/kern/opensolaris_zone.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/acl/acl_common.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/avl/avl.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/nvpair/nvpair.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/unicode/u8_textprep.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zfs_comutil.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zfs_deleg.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zfs_fletcher.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zfs_prop.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zpool_prop.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/zfs/zprop_common.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/gfs.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/vnode.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/ddt_zap.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c optional zfs compile-with "${ZFS_C}" \
+ warning "kernel contains CDDL licensed ZFS filesystem"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_onexit.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zle.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/os/callb.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/os/fm.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/os/list.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/zmod/adler32.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/zmod/deflate.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/zmod/inffast.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/zmod/inflate.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/zmod/inftrees.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/zmod/trees.c optional zfs compile-with "${ZFS_C}"
+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}"
contrib/altq/altq/altq_cbq.c optional altq \
compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/altq/altq/altq_cdnr.c optional altq
@@ -155,154 +278,157 @@ contrib/altq/altq/altq_rio.c optional altq \
contrib/altq/altq/altq_rmclass.c optional altq
contrib/altq/altq/altq_subr.c optional altq \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/dev/acpica/debugger/dbcmds.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbdisply.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbexec.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbfileio.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbhistry.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbinput.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbmethod.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbnames.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbstats.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbutils.c optional acpi acpi_debug
-contrib/dev/acpica/debugger/dbxface.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmbuffer.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmnames.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmopcode.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmobject.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmresrc.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmresrcl.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmresrcl2.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmresrcs.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmutils.c optional acpi acpi_debug
-contrib/dev/acpica/disassembler/dmwalk.c optional acpi acpi_debug
-contrib/dev/acpica/dispatcher/dsargs.c optional acpi
-contrib/dev/acpica/dispatcher/dscontrol.c optional acpi
-contrib/dev/acpica/dispatcher/dsfield.c optional acpi
-contrib/dev/acpica/dispatcher/dsinit.c optional acpi
-contrib/dev/acpica/dispatcher/dsmethod.c optional acpi
-contrib/dev/acpica/dispatcher/dsmthdat.c optional acpi
-contrib/dev/acpica/dispatcher/dsobject.c optional acpi
-contrib/dev/acpica/dispatcher/dsopcode.c optional acpi
-contrib/dev/acpica/dispatcher/dsutils.c optional acpi
-contrib/dev/acpica/dispatcher/dswexec.c optional acpi
-contrib/dev/acpica/dispatcher/dswload.c optional acpi
-contrib/dev/acpica/dispatcher/dswload2.c optional acpi
-contrib/dev/acpica/dispatcher/dswscope.c optional acpi
-contrib/dev/acpica/dispatcher/dswstate.c optional acpi
-contrib/dev/acpica/events/evevent.c optional acpi
-contrib/dev/acpica/events/evglock.c optional acpi
-contrib/dev/acpica/events/evgpe.c optional acpi
-contrib/dev/acpica/events/evgpeblk.c optional acpi
-contrib/dev/acpica/events/evgpeinit.c optional acpi
-contrib/dev/acpica/events/evgpeutil.c optional acpi
-contrib/dev/acpica/events/evmisc.c optional acpi
-contrib/dev/acpica/events/evregion.c optional acpi
-contrib/dev/acpica/events/evrgnini.c optional acpi
-contrib/dev/acpica/events/evsci.c optional acpi
-contrib/dev/acpica/events/evxface.c optional acpi
-contrib/dev/acpica/events/evxfevnt.c optional acpi
-contrib/dev/acpica/events/evxfgpe.c optional acpi
-contrib/dev/acpica/events/evxfregn.c optional acpi
-contrib/dev/acpica/executer/exconfig.c optional acpi
-contrib/dev/acpica/executer/exconvrt.c optional acpi
-contrib/dev/acpica/executer/excreate.c optional acpi
-contrib/dev/acpica/executer/exdebug.c optional acpi
-contrib/dev/acpica/executer/exdump.c optional acpi
-contrib/dev/acpica/executer/exfield.c optional acpi
-contrib/dev/acpica/executer/exfldio.c optional acpi
-contrib/dev/acpica/executer/exmisc.c optional acpi
-contrib/dev/acpica/executer/exmutex.c optional acpi
-contrib/dev/acpica/executer/exnames.c optional acpi
-contrib/dev/acpica/executer/exoparg1.c optional acpi
-contrib/dev/acpica/executer/exoparg2.c optional acpi
-contrib/dev/acpica/executer/exoparg3.c optional acpi
-contrib/dev/acpica/executer/exoparg6.c optional acpi
-contrib/dev/acpica/executer/exprep.c optional acpi
-contrib/dev/acpica/executer/exregion.c optional acpi
-contrib/dev/acpica/executer/exresnte.c optional acpi
-contrib/dev/acpica/executer/exresolv.c optional acpi
-contrib/dev/acpica/executer/exresop.c optional acpi
-contrib/dev/acpica/executer/exstore.c optional acpi
-contrib/dev/acpica/executer/exstoren.c optional acpi
-contrib/dev/acpica/executer/exstorob.c optional acpi
-contrib/dev/acpica/executer/exsystem.c optional acpi
-contrib/dev/acpica/executer/exutils.c optional acpi
-contrib/dev/acpica/hardware/hwacpi.c optional acpi
-contrib/dev/acpica/hardware/hwgpe.c optional acpi
-contrib/dev/acpica/hardware/hwpci.c optional acpi
-contrib/dev/acpica/hardware/hwregs.c optional acpi
-contrib/dev/acpica/hardware/hwsleep.c optional acpi
-contrib/dev/acpica/hardware/hwtimer.c optional acpi
-contrib/dev/acpica/hardware/hwvalid.c optional acpi
-contrib/dev/acpica/hardware/hwxface.c optional acpi
-contrib/dev/acpica/namespace/nsaccess.c optional acpi
-contrib/dev/acpica/namespace/nsalloc.c optional acpi
-contrib/dev/acpica/namespace/nsdump.c optional acpi
-contrib/dev/acpica/namespace/nseval.c optional acpi
-contrib/dev/acpica/namespace/nsinit.c optional acpi
-contrib/dev/acpica/namespace/nsload.c optional acpi
-contrib/dev/acpica/namespace/nsnames.c optional acpi
-contrib/dev/acpica/namespace/nsobject.c optional acpi
-contrib/dev/acpica/namespace/nsparse.c optional acpi
-contrib/dev/acpica/namespace/nspredef.c optional acpi
-contrib/dev/acpica/namespace/nsrepair.c optional acpi
-contrib/dev/acpica/namespace/nsrepair2.c optional acpi
-contrib/dev/acpica/namespace/nssearch.c optional acpi
-contrib/dev/acpica/namespace/nsutils.c optional acpi
-contrib/dev/acpica/namespace/nswalk.c optional acpi
-contrib/dev/acpica/namespace/nsxfeval.c optional acpi
-contrib/dev/acpica/namespace/nsxfname.c optional acpi
-contrib/dev/acpica/namespace/nsxfobj.c optional acpi
-contrib/dev/acpica/parser/psargs.c optional acpi
-contrib/dev/acpica/parser/psloop.c optional acpi
-contrib/dev/acpica/parser/psopcode.c optional acpi
-contrib/dev/acpica/parser/psparse.c optional acpi
-contrib/dev/acpica/parser/psscope.c optional acpi
-contrib/dev/acpica/parser/pstree.c optional acpi
-contrib/dev/acpica/parser/psutils.c optional acpi
-contrib/dev/acpica/parser/pswalk.c optional acpi
-contrib/dev/acpica/parser/psxface.c optional acpi
-contrib/dev/acpica/resources/rsaddr.c optional acpi
-contrib/dev/acpica/resources/rscalc.c optional acpi
-contrib/dev/acpica/resources/rscreate.c optional acpi
-contrib/dev/acpica/resources/rsdump.c optional acpi
-contrib/dev/acpica/resources/rsinfo.c optional acpi
-contrib/dev/acpica/resources/rsio.c optional acpi
-contrib/dev/acpica/resources/rsirq.c optional acpi
-contrib/dev/acpica/resources/rslist.c optional acpi
-contrib/dev/acpica/resources/rsmemory.c optional acpi
-contrib/dev/acpica/resources/rsmisc.c optional acpi
-contrib/dev/acpica/resources/rsserial.c optional acpi
-contrib/dev/acpica/resources/rsutils.c optional acpi
-contrib/dev/acpica/resources/rsxface.c optional acpi
-contrib/dev/acpica/tables/tbfadt.c optional acpi
-contrib/dev/acpica/tables/tbfind.c optional acpi
-contrib/dev/acpica/tables/tbinstal.c optional acpi
-contrib/dev/acpica/tables/tbutils.c optional acpi
-contrib/dev/acpica/tables/tbxface.c optional acpi
-contrib/dev/acpica/tables/tbxfroot.c optional acpi
-contrib/dev/acpica/utilities/utalloc.c optional acpi
-contrib/dev/acpica/utilities/utcache.c optional acpi
-contrib/dev/acpica/utilities/utcopy.c optional acpi
-contrib/dev/acpica/utilities/utdebug.c optional acpi
-contrib/dev/acpica/utilities/utdecode.c optional acpi
-contrib/dev/acpica/utilities/utdelete.c optional acpi
-contrib/dev/acpica/utilities/uteval.c optional acpi
-contrib/dev/acpica/utilities/utglobal.c optional acpi
-contrib/dev/acpica/utilities/utids.c optional acpi
-contrib/dev/acpica/utilities/utinit.c optional acpi
-contrib/dev/acpica/utilities/utlock.c optional acpi
-contrib/dev/acpica/utilities/utmath.c optional acpi
-contrib/dev/acpica/utilities/utmisc.c optional acpi
-contrib/dev/acpica/utilities/utmutex.c optional acpi
-contrib/dev/acpica/utilities/utobject.c optional acpi
-contrib/dev/acpica/utilities/utosi.c optional acpi
-contrib/dev/acpica/utilities/utresrc.c optional acpi
-contrib/dev/acpica/utilities/utstate.c optional acpi
-contrib/dev/acpica/utilities/utxface.c optional acpi
-contrib/dev/acpica/utilities/utxferror.c optional acpi
-#contrib/dev/acpica/utilities/utxfmutex.c optional acpi
+contrib/dev/acpica/components/debugger/dbcmds.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbdisply.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbexec.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbfileio.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbhistry.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbinput.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbmethod.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbnames.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbstats.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbutils.c optional acpi acpi_debug
+contrib/dev/acpica/components/debugger/dbxface.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmbuffer.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmnames.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmopcode.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmobject.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrc.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrcl.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrcl2.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmresrcs.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmutils.c optional acpi acpi_debug
+contrib/dev/acpica/components/disassembler/dmwalk.c optional acpi acpi_debug
+contrib/dev/acpica/components/dispatcher/dsargs.c optional acpi
+contrib/dev/acpica/components/dispatcher/dscontrol.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsfield.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsinit.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsmethod.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsmthdat.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsobject.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsopcode.c optional acpi
+contrib/dev/acpica/components/dispatcher/dsutils.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswexec.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswload.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswload2.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswscope.c optional acpi
+contrib/dev/acpica/components/dispatcher/dswstate.c optional acpi
+contrib/dev/acpica/components/events/evevent.c optional acpi
+contrib/dev/acpica/components/events/evglock.c optional acpi
+contrib/dev/acpica/components/events/evgpe.c optional acpi
+contrib/dev/acpica/components/events/evgpeblk.c optional acpi
+contrib/dev/acpica/components/events/evgpeinit.c optional acpi
+contrib/dev/acpica/components/events/evgpeutil.c optional acpi
+contrib/dev/acpica/components/events/evmisc.c optional acpi
+contrib/dev/acpica/components/events/evregion.c optional acpi
+contrib/dev/acpica/components/events/evrgnini.c optional acpi
+contrib/dev/acpica/components/events/evsci.c optional acpi
+contrib/dev/acpica/components/events/evxface.c optional acpi
+contrib/dev/acpica/components/events/evxfevnt.c optional acpi
+contrib/dev/acpica/components/events/evxfgpe.c optional acpi
+contrib/dev/acpica/components/events/evxfregn.c optional acpi
+contrib/dev/acpica/components/executer/exconfig.c optional acpi
+contrib/dev/acpica/components/executer/exconvrt.c optional acpi
+contrib/dev/acpica/components/executer/excreate.c optional acpi
+contrib/dev/acpica/components/executer/exdebug.c optional acpi
+contrib/dev/acpica/components/executer/exdump.c optional acpi
+contrib/dev/acpica/components/executer/exfield.c optional acpi
+contrib/dev/acpica/components/executer/exfldio.c optional acpi
+contrib/dev/acpica/components/executer/exmisc.c optional acpi
+contrib/dev/acpica/components/executer/exmutex.c optional acpi
+contrib/dev/acpica/components/executer/exnames.c optional acpi
+contrib/dev/acpica/components/executer/exoparg1.c optional acpi
+contrib/dev/acpica/components/executer/exoparg2.c optional acpi
+contrib/dev/acpica/components/executer/exoparg3.c optional acpi
+contrib/dev/acpica/components/executer/exoparg6.c optional acpi
+contrib/dev/acpica/components/executer/exprep.c optional acpi
+contrib/dev/acpica/components/executer/exregion.c optional acpi
+contrib/dev/acpica/components/executer/exresnte.c optional acpi
+contrib/dev/acpica/components/executer/exresolv.c optional acpi
+contrib/dev/acpica/components/executer/exresop.c optional acpi
+contrib/dev/acpica/components/executer/exstore.c optional acpi
+contrib/dev/acpica/components/executer/exstoren.c optional acpi
+contrib/dev/acpica/components/executer/exstorob.c optional acpi
+contrib/dev/acpica/components/executer/exsystem.c optional acpi
+contrib/dev/acpica/components/executer/exutils.c optional acpi
+contrib/dev/acpica/components/hardware/hwacpi.c optional acpi
+contrib/dev/acpica/components/hardware/hwesleep.c optional acpi
+contrib/dev/acpica/components/hardware/hwgpe.c optional acpi
+contrib/dev/acpica/components/hardware/hwpci.c optional acpi
+contrib/dev/acpica/components/hardware/hwregs.c optional acpi
+contrib/dev/acpica/components/hardware/hwsleep.c optional acpi
+contrib/dev/acpica/components/hardware/hwtimer.c optional acpi
+contrib/dev/acpica/components/hardware/hwvalid.c optional acpi
+contrib/dev/acpica/components/hardware/hwxface.c optional acpi
+contrib/dev/acpica/components/hardware/hwxfsleep.c optional acpi
+contrib/dev/acpica/components/namespace/nsaccess.c optional acpi
+contrib/dev/acpica/components/namespace/nsalloc.c optional acpi
+contrib/dev/acpica/components/namespace/nsdump.c optional acpi
+contrib/dev/acpica/components/namespace/nseval.c optional acpi
+contrib/dev/acpica/components/namespace/nsinit.c optional acpi
+contrib/dev/acpica/components/namespace/nsload.c optional acpi
+contrib/dev/acpica/components/namespace/nsnames.c optional acpi
+contrib/dev/acpica/components/namespace/nsobject.c optional acpi
+contrib/dev/acpica/components/namespace/nsparse.c optional acpi
+contrib/dev/acpica/components/namespace/nspredef.c optional acpi
+contrib/dev/acpica/components/namespace/nsrepair.c optional acpi
+contrib/dev/acpica/components/namespace/nsrepair2.c optional acpi
+contrib/dev/acpica/components/namespace/nssearch.c optional acpi
+contrib/dev/acpica/components/namespace/nsutils.c optional acpi
+contrib/dev/acpica/components/namespace/nswalk.c optional acpi
+contrib/dev/acpica/components/namespace/nsxfeval.c optional acpi
+contrib/dev/acpica/components/namespace/nsxfname.c optional acpi
+contrib/dev/acpica/components/namespace/nsxfobj.c optional acpi
+contrib/dev/acpica/components/parser/psargs.c optional acpi
+contrib/dev/acpica/components/parser/psloop.c optional acpi
+contrib/dev/acpica/components/parser/psopcode.c optional acpi
+contrib/dev/acpica/components/parser/psparse.c optional acpi
+contrib/dev/acpica/components/parser/psscope.c optional acpi
+contrib/dev/acpica/components/parser/pstree.c optional acpi
+contrib/dev/acpica/components/parser/psutils.c optional acpi
+contrib/dev/acpica/components/parser/pswalk.c optional acpi
+contrib/dev/acpica/components/parser/psxface.c optional acpi
+contrib/dev/acpica/components/resources/rsaddr.c optional acpi
+contrib/dev/acpica/components/resources/rscalc.c optional acpi
+contrib/dev/acpica/components/resources/rscreate.c optional acpi
+contrib/dev/acpica/components/resources/rsdump.c optional acpi
+contrib/dev/acpica/components/resources/rsinfo.c optional acpi
+contrib/dev/acpica/components/resources/rsio.c optional acpi
+contrib/dev/acpica/components/resources/rsirq.c optional acpi
+contrib/dev/acpica/components/resources/rslist.c optional acpi
+contrib/dev/acpica/components/resources/rsmemory.c optional acpi
+contrib/dev/acpica/components/resources/rsmisc.c optional acpi
+contrib/dev/acpica/components/resources/rsserial.c optional acpi
+contrib/dev/acpica/components/resources/rsutils.c optional acpi
+contrib/dev/acpica/components/resources/rsxface.c optional acpi
+contrib/dev/acpica/components/tables/tbfadt.c optional acpi
+contrib/dev/acpica/components/tables/tbfind.c optional acpi
+contrib/dev/acpica/components/tables/tbinstal.c optional acpi
+contrib/dev/acpica/components/tables/tbutils.c optional acpi
+contrib/dev/acpica/components/tables/tbxface.c optional acpi
+contrib/dev/acpica/components/tables/tbxfroot.c optional acpi
+contrib/dev/acpica/components/utilities/utaddress.c optional acpi
+contrib/dev/acpica/components/utilities/utalloc.c optional acpi
+contrib/dev/acpica/components/utilities/utcache.c optional acpi
+contrib/dev/acpica/components/utilities/utcopy.c optional acpi
+contrib/dev/acpica/components/utilities/utdebug.c optional acpi
+contrib/dev/acpica/components/utilities/utdecode.c optional acpi
+contrib/dev/acpica/components/utilities/utdelete.c optional acpi
+contrib/dev/acpica/components/utilities/uteval.c optional acpi
+contrib/dev/acpica/components/utilities/utglobal.c optional acpi
+contrib/dev/acpica/components/utilities/utids.c optional acpi
+contrib/dev/acpica/components/utilities/utinit.c optional acpi
+contrib/dev/acpica/components/utilities/utlock.c optional acpi
+contrib/dev/acpica/components/utilities/utmath.c optional acpi
+contrib/dev/acpica/components/utilities/utmisc.c optional acpi
+contrib/dev/acpica/components/utilities/utmutex.c optional acpi
+contrib/dev/acpica/components/utilities/utobject.c optional acpi
+contrib/dev/acpica/components/utilities/utosi.c optional acpi
+contrib/dev/acpica/components/utilities/utresrc.c optional acpi
+contrib/dev/acpica/components/utilities/utstate.c optional acpi
+contrib/dev/acpica/components/utilities/utxface.c optional acpi
+contrib/dev/acpica/components/utilities/utxferror.c optional acpi
+#contrib/dev/acpica/components/utilities/utxfmutex.c optional acpi
contrib/ipfilter/netinet/fil.c optional ipfilter inet \
compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/contrib/ipfilter"
contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
@@ -414,7 +540,7 @@ crypto/rijndael/rijndael-api.c optional crypto | ipsec | wlan_ccmp
crypto/sha1.c optional carp | crypto | ipsec | \
netgraph_mppc_encryption | sctp
crypto/sha2/sha2.c optional crypto | geom_bde | ipsec | random | \
- sctp
+ sctp | zfs
ddb/db_access.c optional ddb
ddb/db_break.c optional ddb
ddb/db_capture.c optional ddb
@@ -772,6 +898,10 @@ dev/ath/ath_hal/ar5416/ar5416_power.c \
optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
ath_ar9287 \
compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_radar.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
+ ath_ar9287 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
dev/ath/ath_hal/ar5416/ar5416_recv.c \
optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
ath_ar9287 \
@@ -1130,6 +1260,7 @@ dev/hme/if_hme_sbus.c optional hme sbus
dev/hptiop/hptiop.c optional hptiop scbus
dev/hwpmc/hwpmc_logging.c optional hwpmc
dev/hwpmc/hwpmc_mod.c optional hwpmc
+dev/hwpmc/hwpmc_soft.c optional hwpmc
dev/ichsmb/ichsmb.c optional ichsmb
dev/ichsmb/ichsmb_pci.c optional ichsmb pci
dev/ida/ida.c optional ida
@@ -1144,6 +1275,7 @@ dev/ieee488/tnt4882.c optional tnt4882
dev/ieee488/upd7210.c optional pcii | tnt4882
dev/iicbus/ad7418.c optional ad7418
dev/iicbus/ds133x.c optional ds133x
+dev/iicbus/ds1374.c optional ds1374
dev/iicbus/ds1672.c optional ds1672
dev/iicbus/icee.c optional icee
dev/iicbus/if_ic.c optional ic
@@ -1155,6 +1287,8 @@ dev/iicbus/iicbus_if.m optional iicbus
dev/iicbus/iiconf.c optional iicbus
dev/iicbus/iicsmb.c optional iicsmb \
dependency "iicbus_if.h"
+dev/iicbus/iicoc.c optional iicoc
+dev/iicbus/pcf8563.c optional pcf8563
dev/iir/iir.c optional iir
dev/iir/iir_ctrl.c optional iir
dev/iir/iir_pci.c optional iir pci
@@ -1396,6 +1530,8 @@ dev/ixgbe/ixgbe_82598.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/ixgbe/ixgbe_82599.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_x540.c optional ixgbe inet \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/jme/if_jme.c optional jme pci
dev/joy/joy.c optional joy
dev/joy/joy_isa.c optional joy isa
@@ -1423,6 +1559,8 @@ dev/mfi/mfi.c optional mfi
dev/mfi/mfi_debug.c optional mfi
dev/mfi/mfi_pci.c optional mfi pci
dev/mfi/mfi_disk.c optional mfi
+dev/mfi/mfi_syspd.c optional mfi
+dev/mfi/mfi_tbolt.c optional mfi
dev/mfi/mfi_linux.c optional mfi compat_linux
dev/mfi/mfi_cam.c optional mfip scbus
dev/mii/acphy.c optional miibus | acphy
@@ -1470,8 +1608,12 @@ dev/mmc/mmcbus_if.m standard
dev/mmc/mmcsd.c optional mmcsd
dev/mn/if_mn.c optional mn pci
dev/mps/mps.c optional mps
+dev/mps/mps_config.c optional mps
+dev/mps/mps_mapping.c optional mps
dev/mps/mps_pci.c optional mps pci
-dev/mps/mps_sas.c optional mps
+dev/mps/mps_sas.c optional mps \
+ compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
+dev/mps/mps_sas_lsi.c optional mps
dev/mps/mps_table.c optional mps
dev/mps/mps_user.c optional mps
dev/mpt/mpt.c optional mpt
@@ -1545,6 +1687,12 @@ dev/nmdm/nmdm.c optional nmdm
dev/nsp/nsp.c optional nsp
dev/nsp/nsp_pccard.c optional nsp pccard
dev/null/null.c standard
+dev/oce/oce_hw.c optional oce pci
+dev/oce/oce_if.c optional oce pci
+dev/oce/oce_mbox.c optional oce pci
+dev/oce/oce_queue.c optional oce pci
+dev/oce/oce_sysctl.c optional oce pci
+dev/oce/oce_util.c optional oce pci
dev/patm/if_patm.c optional patm pci
dev/patm/if_patm_attach.c optional patm pci
dev/patm/if_patm_intr.c optional patm pci
@@ -1728,32 +1876,20 @@ dev/sound/pci/als4000.c optional snd_als4000 pci
dev/sound/pci/atiixp.c optional snd_atiixp pci
dev/sound/pci/cmi.c optional snd_cmi pci
dev/sound/pci/cs4281.c optional snd_cs4281 pci
-dev/sound/pci/csa.c optional snd_csa pci \
- warning "kernel contains GPL contaminated csaimg.h header"
+dev/sound/pci/csa.c optional snd_csa pci
dev/sound/pci/csapcm.c optional snd_csa pci
dev/sound/pci/ds1.c optional snd_ds1 pci
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci
-dev/sound/pci/emu10kx.c optional snd_emu10kx pci \
- dependency "emu10k1-alsa%diked.h" \
- dependency "p16v-alsa%diked.h" \
- dependency "p17v-alsa%diked.h" \
- warning "kernel contains GPL contaminated emu10kx headers"
-dev/sound/pci/emu10kx-pcm.c optional snd_emu10kx pci \
- dependency "emu10k1-alsa%diked.h" \
- dependency "p16v-alsa%diked.h" \
- dependency "p17v-alsa%diked.h" \
- warning "kernel contains GPL contaminated emu10kx headers"
-dev/sound/pci/emu10kx-midi.c optional snd_emu10kx pci \
- dependency "emu10k1-alsa%diked.h" \
- warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/emu10kx.c optional snd_emu10kx pci
+dev/sound/pci/emu10kx-pcm.c optional snd_emu10kx pci
+dev/sound/pci/emu10kx-midi.c optional snd_emu10kx pci
dev/sound/pci/envy24.c optional snd_envy24 pci
dev/sound/pci/envy24ht.c optional snd_envy24ht pci
dev/sound/pci/es137x.c optional snd_es137x pci
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
dev/sound/pci/maestro.c optional snd_maestro pci
-dev/sound/pci/maestro3.c optional snd_maestro3 pci \
- warning "kernel contains GPL contaminated maestro3 headers"
+dev/sound/pci/maestro3.c optional snd_maestro3 pci
dev/sound/pci/neomagic.c optional snd_neomagic pci
dev/sound/pci/solo.c optional snd_solo pci
dev/sound/pci/spicds.c optional snd_spicds pci
@@ -1761,7 +1897,13 @@ dev/sound/pci/t4dwave.c optional snd_t4dwave pci
dev/sound/pci/via8233.c optional snd_via8233 pci
dev/sound/pci/via82c686.c optional snd_via82c686 pci
dev/sound/pci/vibes.c optional snd_vibes pci
+dev/sound/pci/hda/hdaa.c optional snd_hda pci
+dev/sound/pci/hda/hdaa_patches.c optional snd_hda pci
dev/sound/pci/hda/hdac.c optional snd_hda pci
+dev/sound/pci/hda/hdac_if.m optional snd_hda pci
+dev/sound/pci/hda/hdacc.c optional snd_hda pci
+dev/sound/pci/hdspe.c optional snd_hdspe pci
+dev/sound/pci/hdspe-pcm.c optional snd_hdspe pci
dev/sound/pcm/ac97.c optional sound
dev/sound/pcm/ac97_if.m optional sound
dev/sound/pcm/ac97_patch.c optional sound
@@ -2246,6 +2388,7 @@ geom/part/g_part_apm.c optional geom_part_apm
geom/part/g_part_bsd.c optional geom_part_bsd
geom/part/g_part_ebr.c optional geom_part_ebr
geom/part/g_part_gpt.c optional geom_part_gpt
+geom/part/g_part_ldm.c optional geom_part_ldm
geom/part/g_part_mbr.c optional geom_part_mbr
geom/part/g_part_pc98.c optional geom_part_pc98
geom/part/g_part_vtoc8.c optional geom_part_vtoc8
@@ -2262,10 +2405,27 @@ geom/raid/tr_concat.c optional geom_raid
geom/raid/tr_raid0.c optional geom_raid
geom/raid/tr_raid1.c optional geom_raid
geom/raid/tr_raid1e.c optional geom_raid
+geom/raid/tr_raid5.c optional geom_raid
geom/raid3/g_raid3.c optional geom_raid3
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
geom/stripe/g_stripe.c optional geom_stripe
+geom/uncompress/g_uncompress.c optional geom_uncompress
+contrib/xz-embedded/freebsd/xz_malloc.c \
+ optional xz_embedded | geom_uncompress \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_crc32.c \
+ optional xz_embedded | geom_uncompress \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c \
+ optional xz_embedded | geom_uncompress \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c \
+ optional xz_embedded | geom_uncompress \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
+contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c \
+ optional xz_embedded | geom_uncompress \
+ compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
geom/uzip/g_uzip.c optional geom_uzip
geom/virstor/binstream.c optional geom_virstor
geom/virstor/g_virstor.c optional geom_virstor
@@ -2393,8 +2553,8 @@ kern/sched_ule.c optional sched_ule
kern/serdev_if.m standard
kern/stack_protector.c standard \
compile-with "${NORMAL_C:N-fstack-protector*}"
-kern/subr_acl_nfs4.c standard
-kern/subr_acl_posix1e.c standard
+kern/subr_acl_nfs4.c optional ufs_acl
+kern/subr_acl_posix1e.c optional ufs_acl
kern/subr_autoconf.c standard
kern/subr_blist.c standard
kern/subr_bus.c standard
@@ -2487,17 +2647,17 @@ kern/vfs_vnops.c standard
#
gssd.h optional kgssapi \
dependency "$S/kgssapi/gssd.x" \
- compile-with "rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \
+ compile-with "RPCGEN_CPP='${CPP}' rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \
no-obj no-implicit-rule before-depend local \
clean "gssd.h"
gssd_xdr.c optional kgssapi \
dependency "$S/kgssapi/gssd.x gssd.h" \
- compile-with "rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c" \
+ compile-with "RPCGEN_CPP='${CPP}' rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c" \
no-implicit-rule before-depend local \
clean "gssd_xdr.c"
gssd_clnt.c optional kgssapi \
dependency "$S/kgssapi/gssd.x gssd.h" \
- compile-with "rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \
+ compile-with "RPCGEN_CPP='${CPP}' rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \
no-implicit-rule before-depend local \
clean "gssd_clnt.c"
kgssapi/gss_accept_sec_context.c optional kgssapi
@@ -2636,7 +2796,7 @@ net/slcompress.c optional netgraph_vjc | sppp | \
net/vnet.c optional vimage
net/zlib.c optional crypto | geom_uzip | ipsec | \
mxge | netgraph_deflate | \
- ddb_ctf | gzio
+ ddb_ctf | gzio | geom_uncompress
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan wlan_acl
net80211/ieee80211_action.c optional wlan
@@ -3057,19 +3217,19 @@ ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c optional ipoib \
# no-depend \
# compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
-ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c optional sdp \
+ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c optional sdp inet \
no-depend \
compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
-ofed/drivers/infiniband/ulp/sdp/sdp_main.c optional sdp \
+ofed/drivers/infiniband/ulp/sdp/sdp_main.c optional sdp inet \
no-depend \
compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
-ofed/drivers/infiniband/ulp/sdp/sdp_rx.c optional sdp \
+ofed/drivers/infiniband/ulp/sdp/sdp_rx.c optional sdp inet \
no-depend \
compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
-ofed/drivers/infiniband/ulp/sdp/sdp_cma.c optional sdp \
+ofed/drivers/infiniband/ulp/sdp/sdp_cma.c optional sdp inet \
no-depend \
compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
-ofed/drivers/infiniband/ulp/sdp/sdp_tx.c optional sdp \
+ofed/drivers/infiniband/ulp/sdp/sdp_tx.c optional sdp inet \
no-depend \
compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
@@ -3518,6 +3678,7 @@ dev/xen/blkback/blkback.c optional xen | xenhvm
dev/xen/console/console.c optional xen
dev/xen/console/xencons_ring.c optional xen
dev/xen/control/control.c optional xen | xenhvm
+dev/xen/netback/netback.c optional xen | xenhvm
dev/xen/netfront/netfront.c optional xen | xenhvm
dev/xen/xenpci/xenpci.c optional xenpci
dev/xen/xenpci/evtchn.c optional xenpci
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 847e8ac..1769a176 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -112,9 +112,7 @@ amd64/amd64/gdb_machdep.c optional gdb
amd64/amd64/identcpu.c standard
amd64/amd64/in_cksum.c optional inet | inet6
amd64/amd64/initcpu.c standard
-amd64/amd64/intr_machdep.c standard
amd64/amd64/io.c optional io
-amd64/amd64/legacy.c standard
amd64/amd64/locore.S standard no-obj
amd64/amd64/machdep.c standard
amd64/amd64/mem.c optional mem
@@ -124,6 +122,7 @@ amd64/amd64/mp_watchdog.c optional mp_watchdog smp
amd64/amd64/mpboot.S optional smp
amd64/amd64/pmap.c standard
amd64/amd64/prof_machdep.c optional profiling-routine
+amd64/amd64/ptrace_machdep.c standard
amd64/amd64/sigtramp.S standard
amd64/amd64/stack_machdep.c optional ddb | stack
amd64/amd64/support.S standard
@@ -133,6 +132,7 @@ amd64/amd64/uio_machdep.c standard
amd64/amd64/uma_machdep.c standard
amd64/amd64/vm_machdep.c standard
amd64/pci/pci_cfgreg.c optional pci
+cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
crypto/aesni/aesencdec_amd64.S optional aesni
crypto/aesni/aeskeys_amd64.S optional aesni
crypto/aesni/aesni.c optional aesni
@@ -215,6 +215,7 @@ dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
dev/nve/if_nve.c optional nve pci
dev/nvram/nvram.c optional nvram isa
+dev/random/nehemiah.c optional random
dev/qlxgb/qla_dbg.c optional qlxgb pci
dev/qlxgb/qla_hw.c optional qlxgb pci
dev/qlxgb/qla_ioctl.c optional qlxgb pci
@@ -266,9 +267,119 @@ dev/syscons/scvtb.c optional sc
dev/tpm/tpm.c optional tpm
dev/tpm/tpm_acpi.c optional tpm acpi
dev/tpm/tpm_isa.c optional tpm isa
-dev/uart/uart_cpu_amd64.c optional uart
+dev/uart/uart_cpu_x86.c optional uart
dev/viawd/viawd.c optional viawd
+dev/wbwd/wbwd.c optional wbwd
dev/wpi/if_wpi.c optional wpi
+dev/isci/isci.c optional isci
+dev/isci/isci_controller.c optional isci
+dev/isci/isci_domain.c optional isci
+dev/isci/isci_interrupt.c optional isci
+dev/isci/isci_io_request.c optional isci
+dev/isci/isci_logger.c optional isci
+dev/isci/isci_oem_parameters.c optional isci
+dev/isci/isci_remote_device.c optional isci
+dev/isci/isci_sysctl.c optional isci
+dev/isci/isci_task_request.c optional isci
+dev/isci/isci_timer.c optional isci
+dev/isci/scil/sati.c optional isci
+dev/isci/scil/sati_abort_task_set.c optional isci
+dev/isci/scil/sati_atapi.c optional isci
+dev/isci/scil/sati_device.c optional isci
+dev/isci/scil/sati_inquiry.c optional isci
+dev/isci/scil/sati_log_sense.c optional isci
+dev/isci/scil/sati_lun_reset.c optional isci
+dev/isci/scil/sati_mode_pages.c optional isci
+dev/isci/scil/sati_mode_select.c optional isci
+dev/isci/scil/sati_mode_sense.c optional isci
+dev/isci/scil/sati_mode_sense_10.c optional isci
+dev/isci/scil/sati_mode_sense_6.c optional isci
+dev/isci/scil/sati_move.c optional isci
+dev/isci/scil/sati_passthrough.c optional isci
+dev/isci/scil/sati_read.c optional isci
+dev/isci/scil/sati_read_buffer.c optional isci
+dev/isci/scil/sati_read_capacity.c optional isci
+dev/isci/scil/sati_reassign_blocks.c optional isci
+dev/isci/scil/sati_report_luns.c optional isci
+dev/isci/scil/sati_request_sense.c optional isci
+dev/isci/scil/sati_start_stop_unit.c optional isci
+dev/isci/scil/sati_synchronize_cache.c optional isci
+dev/isci/scil/sati_test_unit_ready.c optional isci
+dev/isci/scil/sati_unmap.c optional isci
+dev/isci/scil/sati_util.c optional isci
+dev/isci/scil/sati_verify.c optional isci
+dev/isci/scil/sati_write.c optional isci
+dev/isci/scil/sati_write_and_verify.c optional isci
+dev/isci/scil/sati_write_buffer.c optional isci
+dev/isci/scil/sati_write_long.c optional isci
+dev/isci/scil/sci_abstract_list.c optional isci
+dev/isci/scil/sci_base_controller.c optional isci
+dev/isci/scil/sci_base_domain.c optional isci
+dev/isci/scil/sci_base_iterator.c optional isci
+dev/isci/scil/sci_base_library.c optional isci
+dev/isci/scil/sci_base_logger.c optional isci
+dev/isci/scil/sci_base_memory_descriptor_list.c optional isci
+dev/isci/scil/sci_base_memory_descriptor_list_decorator.c optional isci
+dev/isci/scil/sci_base_object.c optional isci
+dev/isci/scil/sci_base_observer.c optional isci
+dev/isci/scil/sci_base_phy.c optional isci
+dev/isci/scil/sci_base_port.c optional isci
+dev/isci/scil/sci_base_remote_device.c optional isci
+dev/isci/scil/sci_base_request.c optional isci
+dev/isci/scil/sci_base_state_machine.c optional isci
+dev/isci/scil/sci_base_state_machine_logger.c optional isci
+dev/isci/scil/sci_base_state_machine_observer.c optional isci
+dev/isci/scil/sci_base_subject.c optional isci
+dev/isci/scil/sci_util.c optional isci
+dev/isci/scil/scic_sds_controller.c optional isci
+dev/isci/scil/scic_sds_library.c optional isci
+dev/isci/scil/scic_sds_pci.c optional isci
+dev/isci/scil/scic_sds_phy.c optional isci
+dev/isci/scil/scic_sds_port.c optional isci
+dev/isci/scil/scic_sds_port_configuration_agent.c optional isci
+dev/isci/scil/scic_sds_remote_device.c optional isci
+dev/isci/scil/scic_sds_remote_node_context.c optional isci
+dev/isci/scil/scic_sds_remote_node_table.c optional isci
+dev/isci/scil/scic_sds_request.c optional isci
+dev/isci/scil/scic_sds_sgpio.c optional isci
+dev/isci/scil/scic_sds_smp_remote_device.c optional isci
+dev/isci/scil/scic_sds_smp_request.c optional isci
+dev/isci/scil/scic_sds_ssp_request.c optional isci
+dev/isci/scil/scic_sds_stp_packet_request.c optional isci
+dev/isci/scil/scic_sds_stp_remote_device.c optional isci
+dev/isci/scil/scic_sds_stp_request.c optional isci
+dev/isci/scil/scic_sds_unsolicited_frame_control.c optional isci
+dev/isci/scil/scif_sas_controller.c optional isci
+dev/isci/scil/scif_sas_controller_state_handlers.c optional isci
+dev/isci/scil/scif_sas_controller_states.c optional isci
+dev/isci/scil/scif_sas_domain.c optional isci
+dev/isci/scil/scif_sas_domain_state_handlers.c optional isci
+dev/isci/scil/scif_sas_domain_states.c optional isci
+dev/isci/scil/scif_sas_high_priority_request_queue.c optional isci
+dev/isci/scil/scif_sas_internal_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_io_request_states.c optional isci
+dev/isci/scil/scif_sas_library.c optional isci
+dev/isci/scil/scif_sas_remote_device.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_state_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_states.c optional isci
+dev/isci/scil/scif_sas_request.c optional isci
+dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c optional isci
+dev/isci/scil/scif_sas_smp_io_request.c optional isci
+dev/isci/scil/scif_sas_smp_phy.c optional isci
+dev/isci/scil/scif_sas_smp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_io_request.c optional isci
+dev/isci/scil/scif_sas_stp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_task_request_states.c optional isci
+dev/isci/scil/scif_sas_timer.c optional isci
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
kern/kern_clocksource.c standard
@@ -359,7 +470,7 @@ x86/cpufreq/p4tcc.c optional cpufreq
x86/isa/atpic.c optional atpic isa
x86/isa/atrtc.c standard
x86/isa/clock.c standard
-x86/isa/elcr.c standard
+x86/isa/elcr.c optional atpic isa | mptable
x86/isa/isa.c standard
x86/isa/isa_dma.c standard
x86/isa/nmi.c standard
@@ -368,7 +479,9 @@ x86/pci/pci_bus.c optional pci
x86/pci/qpi.c optional pci
x86/x86/busdma_machdep.c standard
x86/x86/dump_machdep.c standard
+x86/x86/intr_machdep.c standard
x86/x86/io_apic.c standard
+x86/x86/legacy.c standard
x86/x86/local_apic.c standard
x86/x86/mca.c standard
x86/x86/mptable.c optional mptable
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 5887790..5469c6b 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -47,6 +47,7 @@ arm/arm/vm_machdep.c standard
arm/fpe-arm/armfpe_glue.S optional armfpe
arm/fpe-arm/armfpe_init.c optional armfpe
arm/fpe-arm/armfpe.S optional armfpe
+cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs compile-with "${ZFS_C}"
dev/hwpmc/hwpmc_arm.c optional hwpmc
dev/ofw/openfirm.c optional fdt
dev/ofw/openfirmio.c optional fdt
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 8d36c349..668850a 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -71,6 +71,7 @@ hptrr_lib.o optional hptrr \
compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
no-implicit-rule
#
+cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
@@ -243,11 +244,121 @@ dev/syscons/scvtb.c optional sc
dev/tpm/tpm.c optional tpm
dev/tpm/tpm_acpi.c optional tpm acpi
dev/tpm/tpm_isa.c optional tpm isa
-dev/uart/uart_cpu_i386.c optional uart
+dev/uart/uart_cpu_x86.c optional uart
dev/viawd/viawd.c optional viawd
dev/acpica/acpi_if.m standard
dev/acpi_support/acpi_wmi_if.m standard
+dev/wbwd/wbwd.c optional wbwd
dev/wpi/if_wpi.c optional wpi
+dev/isci/isci.c optional isci
+dev/isci/isci_controller.c optional isci
+dev/isci/isci_domain.c optional isci
+dev/isci/isci_interrupt.c optional isci
+dev/isci/isci_io_request.c optional isci
+dev/isci/isci_logger.c optional isci
+dev/isci/isci_oem_parameters.c optional isci
+dev/isci/isci_remote_device.c optional isci
+dev/isci/isci_sysctl.c optional isci
+dev/isci/isci_task_request.c optional isci
+dev/isci/isci_timer.c optional isci
+dev/isci/scil/sati.c optional isci
+dev/isci/scil/sati_abort_task_set.c optional isci
+dev/isci/scil/sati_atapi.c optional isci
+dev/isci/scil/sati_device.c optional isci
+dev/isci/scil/sati_inquiry.c optional isci
+dev/isci/scil/sati_log_sense.c optional isci
+dev/isci/scil/sati_lun_reset.c optional isci
+dev/isci/scil/sati_mode_pages.c optional isci
+dev/isci/scil/sati_mode_select.c optional isci
+dev/isci/scil/sati_mode_sense.c optional isci
+dev/isci/scil/sati_mode_sense_10.c optional isci
+dev/isci/scil/sati_mode_sense_6.c optional isci
+dev/isci/scil/sati_move.c optional isci
+dev/isci/scil/sati_passthrough.c optional isci
+dev/isci/scil/sati_read.c optional isci
+dev/isci/scil/sati_read_buffer.c optional isci
+dev/isci/scil/sati_read_capacity.c optional isci
+dev/isci/scil/sati_reassign_blocks.c optional isci
+dev/isci/scil/sati_report_luns.c optional isci
+dev/isci/scil/sati_request_sense.c optional isci
+dev/isci/scil/sati_start_stop_unit.c optional isci
+dev/isci/scil/sati_synchronize_cache.c optional isci
+dev/isci/scil/sati_test_unit_ready.c optional isci
+dev/isci/scil/sati_unmap.c optional isci
+dev/isci/scil/sati_util.c optional isci
+dev/isci/scil/sati_verify.c optional isci
+dev/isci/scil/sati_write.c optional isci
+dev/isci/scil/sati_write_and_verify.c optional isci
+dev/isci/scil/sati_write_buffer.c optional isci
+dev/isci/scil/sati_write_long.c optional isci
+dev/isci/scil/sci_abstract_list.c optional isci
+dev/isci/scil/sci_base_controller.c optional isci
+dev/isci/scil/sci_base_domain.c optional isci
+dev/isci/scil/sci_base_iterator.c optional isci
+dev/isci/scil/sci_base_library.c optional isci
+dev/isci/scil/sci_base_logger.c optional isci
+dev/isci/scil/sci_base_memory_descriptor_list.c optional isci
+dev/isci/scil/sci_base_memory_descriptor_list_decorator.c optional isci
+dev/isci/scil/sci_base_object.c optional isci
+dev/isci/scil/sci_base_observer.c optional isci
+dev/isci/scil/sci_base_phy.c optional isci
+dev/isci/scil/sci_base_port.c optional isci
+dev/isci/scil/sci_base_remote_device.c optional isci
+dev/isci/scil/sci_base_request.c optional isci
+dev/isci/scil/sci_base_state_machine.c optional isci
+dev/isci/scil/sci_base_state_machine_logger.c optional isci
+dev/isci/scil/sci_base_state_machine_observer.c optional isci
+dev/isci/scil/sci_base_subject.c optional isci
+dev/isci/scil/sci_util.c optional isci
+dev/isci/scil/scic_sds_controller.c optional isci
+dev/isci/scil/scic_sds_library.c optional isci
+dev/isci/scil/scic_sds_pci.c optional isci
+dev/isci/scil/scic_sds_phy.c optional isci
+dev/isci/scil/scic_sds_port.c optional isci
+dev/isci/scil/scic_sds_port_configuration_agent.c optional isci
+dev/isci/scil/scic_sds_remote_device.c optional isci
+dev/isci/scil/scic_sds_remote_node_context.c optional isci
+dev/isci/scil/scic_sds_remote_node_table.c optional isci
+dev/isci/scil/scic_sds_request.c optional isci
+dev/isci/scil/scic_sds_sgpio.c optional isci
+dev/isci/scil/scic_sds_smp_remote_device.c optional isci
+dev/isci/scil/scic_sds_smp_request.c optional isci
+dev/isci/scil/scic_sds_ssp_request.c optional isci
+dev/isci/scil/scic_sds_stp_packet_request.c optional isci
+dev/isci/scil/scic_sds_stp_remote_device.c optional isci
+dev/isci/scil/scic_sds_stp_request.c optional isci
+dev/isci/scil/scic_sds_unsolicited_frame_control.c optional isci
+dev/isci/scil/scif_sas_controller.c optional isci
+dev/isci/scil/scif_sas_controller_state_handlers.c optional isci
+dev/isci/scil/scif_sas_controller_states.c optional isci
+dev/isci/scil/scif_sas_domain.c optional isci
+dev/isci/scil/scif_sas_domain_state_handlers.c optional isci
+dev/isci/scil/scif_sas_domain_states.c optional isci
+dev/isci/scil/scif_sas_high_priority_request_queue.c optional isci
+dev/isci/scil/scif_sas_internal_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request.c optional isci
+dev/isci/scil/scif_sas_io_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_io_request_states.c optional isci
+dev/isci/scil/scif_sas_library.c optional isci
+dev/isci/scil/scif_sas_remote_device.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substate_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_ready_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substate_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_starting_substates.c optional isci
+dev/isci/scil/scif_sas_remote_device_state_handlers.c optional isci
+dev/isci/scil/scif_sas_remote_device_states.c optional isci
+dev/isci/scil/scif_sas_request.c optional isci
+dev/isci/scil/scif_sas_smp_activity_clear_affiliation.c optional isci
+dev/isci/scil/scif_sas_smp_io_request.c optional isci
+dev/isci/scil/scif_sas_smp_phy.c optional isci
+dev/isci/scil/scif_sas_smp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_io_request.c optional isci
+dev/isci/scil/scif_sas_stp_remote_device.c optional isci
+dev/isci/scil/scif_sas_stp_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request.c optional isci
+dev/isci/scil/scif_sas_task_request_state_handlers.c optional isci
+dev/isci/scil/scif_sas_task_request_states.c optional isci
+dev/isci/scil/scif_sas_timer.c optional isci
i386/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi \
dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \
@@ -295,10 +406,8 @@ i386/i386/i686_mem.c optional mem
i386/i386/identcpu.c standard
i386/i386/in_cksum.c optional inet | inet6
i386/i386/initcpu.c standard
-i386/i386/intr_machdep.c standard
i386/i386/io.c optional io
i386/i386/k6_mem.c optional mem
-i386/i386/legacy.c optional native
i386/i386/locore.s optional native no-obj
i386/xen/locore.s optional xen no-obj
i386/i386/longrun.c optional cpu_enable_longrun
@@ -406,9 +515,9 @@ x86/cpufreq/p4tcc.c optional cpufreq
x86/cpufreq/powernow.c optional cpufreq
x86/cpufreq/smist.c optional cpufreq
x86/isa/atpic.c optional atpic
-x86/isa/atrtc.c optional atpic
+x86/isa/atrtc.c optional native
x86/isa/clock.c optional native
-x86/isa/elcr.c standard
+x86/isa/elcr.c optional atpic | apic native
x86/isa/isa.c optional isa
x86/isa/isa_dma.c optional isa
x86/isa/nmi.c standard
@@ -417,7 +526,9 @@ x86/pci/pci_bus.c optional pci
x86/pci/qpi.c optional pci
x86/x86/busdma_machdep.c standard
x86/x86/dump_machdep.c standard
+x86/x86/intr_machdep.c standard
x86/x86/io_apic.c optional apic
+x86/x86/legacy.c optional native
x86/x86/local_apic.c optional apic
x86/x86/mca.c standard
x86/x86/mptable.c optional apic native
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index e341230..f9a62af 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -28,6 +28,7 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
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
diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index b5062ae..2ae3bc9 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -30,7 +30,6 @@ mips/mips/cpu.c standard
mips/mips/elf_machdep.c standard
mips/mips/exception.S standard
mips/mips/gdb_machdep.c standard
-# mips/mips/mainbus.c standard
mips/mips/pmap.c standard
mips/mips/trap.c standard
mips/mips/vm_machdep.c standard
@@ -57,6 +56,7 @@ mips/mips/in_cksum.c optional inet | inet6
mips/mips/locore.S standard no-obj
mips/mips/minidump_machdep.c standard
mips/mips/mem.c optional mem
+mips/mips/libkern_machdep.c standard
mips/mips/nexus.c standard
mips/mips/stack_machdep.c optional ddb | stack
mips/mips/support.S standard
@@ -73,23 +73,26 @@ geom/geom_mbr_enc.c optional geom_mbr
libkern/ashldi3.c standard
libkern/ashrdi3.c standard
libkern/cmpdi2.c standard
-libkern/divdi3.c optional isa_mips32
libkern/ffsl.c standard
libkern/fls.c standard
libkern/flsl.c standard
libkern/lshrdi3.c standard
libkern/memchr.c optional fdt
libkern/memmove.c standard
-libkern/moddi3.c optional isa_mips32
-libkern/qdivrem.c optional isa_mips32
libkern/ucmpdi2.c standard
-libkern/udivdi3.c optional isa_mips32
-libkern/umoddi3.c optional isa_mips32
#XXX: We can't use these versions, as strcmp.c is included conf/files
#libkern/mips/strcmp.S standard
#libkern/mips/strncmp.S standard
+cddl/compat/opensolaris/kern/opensolaris_atomic.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
+kern/imgact_elf32.c optional compat_freebsd32
+mips/mips/freebsd32_machdep.c optional compat_freebsd32
+
kern/kern_clocksource.c standard
kern/link_elf_obj.c standard
@@ -105,7 +108,6 @@ dev/siba/siba_pcib.c optional siba pci
#mips/sentry5/siba_mips.c optional siba # not yet
dev/hwpmc/hwpmc_mips.c optional hwpmc
-dev/hwpmc/hwpmc_mips24k.c optional hwpmc
dev/rt/if_rt.c optional rt
dev/nvram2env/nvram2env.c optional nvram2env
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index e034601..a8e60b6 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -38,6 +38,7 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
+cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
@@ -144,10 +145,8 @@ i386/i386/i686_mem.c optional mem
i386/i386/identcpu.c standard
i386/i386/in_cksum.c optional inet | inet6
i386/i386/initcpu.c standard
-i386/i386/intr_machdep.c standard
i386/i386/io.c optional io
i386/i386/k6_mem.c optional mem
-i386/i386/legacy.c standard
i386/i386/locore.s standard no-obj
i386/i386/mem.c optional mem
i386/i386/minidump_machdep.c standard
@@ -205,7 +204,6 @@ i386/svr4/svr4_locore.s optional compat_svr4 \
dependency "svr4_assym.h" \
warning "COMPAT_SVR4 is broken and should be avoided"
i386/svr4/svr4_machdep.c optional compat_svr4
-#
kern/kern_clocksource.c standard
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
@@ -227,7 +225,7 @@ pc98/cbus/gdc.c optional gdc
pc98/cbus/nmi.c standard
pc98/cbus/olpt.c optional olpt
pc98/cbus/pckbd.c optional pckbd
-pc98/cbus/pcrtc.c optional atpic
+pc98/cbus/pcrtc.c standard
pc98/cbus/pmc.c optional pmc
pc98/cbus/scgdcrndr.c optional sc gdc
pc98/cbus/scterm-sck.c optional sc
@@ -251,7 +249,9 @@ x86/isa/isa.c optional isa
x86/pci/pci_bus.c optional pci
x86/x86/busdma_machdep.c standard
x86/x86/dump_machdep.c standard
+x86/x86/intr_machdep.c standard
x86/x86/io_apic.c optional apic
+x86/x86/legacy.c standard
x86/x86/local_apic.c optional apic
x86/x86/mca.c standard
x86/x86/mptable.c optional apic
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 2760edf..5d9dec5 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -14,6 +14,9 @@ font.h optional sc \
no-obj no-implicit-rule before-depend \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
#
+# There is only an asm version on ppc64.
+cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S optional zfs powerpc64 compile-with "${ZFS_S}"
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/bm/if_bm.c optional bm powermac
@@ -133,6 +136,7 @@ powerpc/mpc85xx/openpic_fdt.c optional fdt
powerpc/mpc85xx/pci_fdt.c optional pci mpc85xx
powerpc/ofw/ofw_cpu.c optional aim
powerpc/ofw/ofw_machdep.c optional aim
+powerpc/ofw/ofw_pci.c optional pci aim
powerpc/ofw/ofw_pcibus.c optional pci aim
powerpc/ofw/ofw_pcib_pci.c optional pci aim
powerpc/ofw/ofw_real.c optional aim
@@ -144,6 +148,7 @@ powerpc/ofw/rtas.c optional aim
powerpc/powermac/ata_kauai.c optional powermac ata | powermac atamacio
powerpc/powermac/ata_macio.c optional powermac ata | powermac atamacio
powerpc/powermac/ata_dbdma.c optional powermac ata | powermac atamacio
+powerpc/powermac/atibl.c optional powermac atibl
powerpc/powermac/cuda.c optional powermac cuda
powerpc/powermac/cpcht.c optional powermac pci
powerpc/powermac/dbdma.c optional powermac pci
@@ -165,7 +170,6 @@ powerpc/powermac/uninorthpci.c optional powermac pci
powerpc/powermac/vcoregpio.c optional powermac
powerpc/powermac/windtunnel.c optional powermac windtunnel
powerpc/powerpc/altivec.c optional aim
-powerpc/powerpc/atomic.S standard
powerpc/powerpc/autoconf.c standard
powerpc/powerpc/bcopy.c standard
powerpc/powerpc/bus_machdep.c standard
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 1ff61b1..68c0413 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -22,6 +22,7 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
+cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/atkbdc/atkbd.c optional atkbd atkbdc
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index d561aae..5cb718e 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -15,13 +15,15 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
# Disable a few warnings for clang, since there are several places in the
# kernel where fixing them is more trouble than it is worth, or where there is
# a false positive.
-.if ${CC:T:Mclang} == "clang"
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
NO_WCONSTANT_CONVERSION= -Wno-constant-conversion
NO_WARRAY_BOUNDS= -Wno-array-bounds
NO_WSHIFT_COUNT_NEGATIVE= -Wno-shift-count-negative
NO_WSHIFT_COUNT_OVERFLOW= -Wno-shift-count-overflow
NO_WUNUSED_VALUE= -Wno-unused-value
NO_WSELF_ASSIGN= -Wno-self-assign
+NO_WFORMAT_SECURITY= -Wno-format-security
+NO_WUNNEEDED_INTERNAL_DECL= -Wno-unneeded-internal-declaration
# Several other warnings which might be useful in some cases, but not severe
# enough to error out the whole kernel build. Display them anyway, so there is
# some incentive to fix them eventually.
@@ -45,16 +47,16 @@ CWARNEXTRA?= -Wno-error-tautological-compare -Wno-error-empty-body \
# Setting -mno-sse implies -mno-sse2, -mno-sse3 and -mno-ssse3
#
# clang:
-# Setting -mno-mmx implies -mno-3dnow, -mno-3dnowa, -mno-sse, -mno-sse2,
-# -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
+# Setting -mno-mmx implies -mno-3dnow and -mno-3dnowa
+# Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
#
.if ${MACHINE_CPUARCH} == "i386"
-.if ${CC:T:Mclang} != "clang"
-CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
+CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
.else
CFLAGS+= -mno-aes -mno-avx
.endif
-CFLAGS+= -mno-mmx -msoft-float
+CFLAGS+= -mno-mmx -mno-sse -msoft-float
INLINE_LIMIT?= 8000
.endif
@@ -92,17 +94,15 @@ INLINE_LIMIT?= 15000
# Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3 and -mfpmath=387
#
# clang:
-# Setting -mno-mmx implies -mno-3dnow, -mno-3dnowa, -mno-sse, -mno-sse2,
-# -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
+# Setting -mno-mmx implies -mno-3dnow and -mno-3dnowa
+# Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
# (-mfpmath= is not supported)
#
.if ${MACHINE_CPUARCH} == "amd64"
-.if ${CC:T:Mclang} != "clang"
-CFLAGS+= -mno-sse
-.else
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
CFLAGS+= -mno-aes -mno-avx
.endif
-CFLAGS+= -mcmodel=kernel -mno-red-zone -mno-mmx -msoft-float \
+CFLAGS+= -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float \
-fno-asynchronous-unwind-tables
INLINE_LIMIT?= 8000
.endif
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 2a89294..5f878d8 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -152,6 +152,12 @@ genassym.o: $S/$M/$M/genassym.c
${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
+# We have "special" -I include paths for opensolaris/zfs files in 'depend'.
+CFILES_NOZFS= ${CFILES:N*/opensolaris/*}
+SFILES_NOZFS= ${SFILES:N*/opensolaris/*}
+CFILES_ZFS= ${CFILES:M*/opensolaris/*}
+SFILES_ZFS= ${SFILES:M*/opensolaris/*}
+
kernel-depend: .depend
# The argument list can be very long, so use make -V and xargs to
# pass it to mkdep.
@@ -160,10 +166,14 @@ SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
${MFILES:T:S/.m$/.h/}
.depend: .PRECIOUS ${SRCS}
rm -f .newdep
- ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \
+ ${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \
MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
- ${MAKE} -V SFILES | \
+ ${MAKE} -V CFILES_ZFS | \
+ MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${ZFS_CFLAGS}
+ ${MAKE} -V SFILES_NOZFS | \
MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
+ ${MAKE} -V SFILES_ZFS | \
+ MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ZFS_ASM_CFLAGS}
rm -f .depend
mv .newdep .depend
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index a209ddd..f50a2a0 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -6,7 +6,7 @@
.include <bsd.own.mk>
# backwards compat option for older systems.
-MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel
@@ -34,7 +34,7 @@ _MINUS_O= -O2
.endif
.endif
.if ${MACHINE_CPUARCH} == "amd64"
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
COPTFLAGS?=-O2 -frename-registers -pipe
.else
COPTFLAGS?=-O2 -pipe
@@ -84,7 +84,7 @@ INCLUDES+= -I$S/dev/cxgb -I$S/dev/cxgbe
CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
.if ${MACHINE_CPUARCH} != "mips"
CFLAGS+= --param inline-unit-growth=100
@@ -101,6 +101,10 @@ WERROR?= -Werror
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
+CLANG_NO_IAS= -no-integrated-as
+.endif
+
.if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
CFLAGS+= -DGPROF -falign-functions=16
.if ${PROFLEVEL} >= 2
@@ -127,6 +131,12 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
+# Special flags for managing the compat compiles for ZFS
+ZFS_CFLAGS= -DFREEBSD_NAMECACHE -DBUILDING_ZFS -nostdinc -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common/fs/zfs -I$S/cddl/contrib/opensolaris/uts/common/zmod -I$S/cddl/contrib/opensolaris/uts/common -I$S -I$S/cddl/contrib/opensolaris/common/zfs -I$S/cddl/contrib/opensolaris/common ${CFLAGS} -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch -Wno-pointer-arith -Wno-unknown-pragmas
+ZFS_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${ZFS_CFLAGS}
+ZFS_C= ${CC} -c ${ZFS_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
+ZFS_S= ${CC} -c ${ZFS_ASM_CFLAGS} ${WERROR} ${.IMPSRC}
+
.if ${MK_CTF} != "no"
NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.elif ${MAKE_VERSION} >= 5201111300
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 7bf7643..929cec6 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -61,7 +61,7 @@
#
# backwards compat option for older systems.
-MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
AWK?= awk
KMODLOAD?= /sbin/kldload
@@ -108,7 +108,7 @@ CFLAGS+= -I. -I@
# for example.
CFLAGS+= -I@/contrib/altq
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -finline-limit=${INLINE_LIMIT}
CFLAGS+= --param inline-unit-growth=100
CFLAGS+= --param large-function-growth=1000
@@ -340,11 +340,13 @@ CFLAGS+= ${CONF_CFLAGS}
MFILES?= dev/acpica/acpi_if.m dev/acpi_support/acpi_wmi_if.m \
dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \
+ dev/gpio/gpio_if.m dev/gpio/gpiobus_if.m \
dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \
dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \
dev/mii/miibus_if.m dev/mvs/mvs_if.m dev/ofw/ofw_bus_if.m \
dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
+ dev/sound/pci/hda/hdac_if.m \
dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \
dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \
diff --git a/sys/conf/ldscript.powerpc64 b/sys/conf/ldscript.powerpc64
index a3bd1ff..fafce7b 100644
--- a/sys/conf/ldscript.powerpc64
+++ b/sys/conf/ldscript.powerpc64
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
OUTPUT_FORMAT("elf64-powerpc", "elf64-powerpc", "elf64-powerpc")
-OUTPUT_ARCH(powerpc)
+OUTPUT_ARCH(powerpc:common64)
ENTRY(__start)
SEARCH_DIR(/usr/lib);
PROVIDE (__stack = 0);
@@ -56,15 +56,19 @@ SECTIONS
.sdata2 : { *(.sdata2) }
.sbss2 : { *(.sbss2) }
/* Adjust the address for the data segment to the next page up. */
- . = ((. + 0x1000) & ~(0x1000 - 1));
+ . = ALIGN(4096);
.data :
{
*(.data)
*(.gnu.linkonce.d*)
CONSTRUCTORS
}
- .data1 : { *(.data1) }
- .got1 : { *(.got1) }
+ .data1 : { *(.data1) }
+ .toc1 : ALIGN(8) { *(.toc1) }
+ .opd : ALIGN(8) { KEEP (*(.opd)) }
+ .branch_lt : ALIGN(8) { *(.branch_lt) }
+ .got : ALIGN(8) { *(.got .toc) }
+
.dynamic : { *(.dynamic) }
/* Put .ctors and .dtors next to the .got2 section, so that the pointers
get relocated with -mrelocatable. Also put in the .fixup pointers.
@@ -81,10 +85,6 @@ SECTIONS
.fixup : { *(.fixup) }
PROVIDE (_FIXUP_END_ = .);
PROVIDE (_GOT2_END_ = .);
- PROVIDE (_GOT_START_ = .);
- .got : { *(.got) }
- .got.plt : { *(.got.plt) }
- PROVIDE (_GOT_END_ = .);
/* We want the small data sections together, so single-instruction offsets
can access them all, and initialized data all before uninitialized, so
we can shorten the on-disk segment size. */
diff --git a/sys/conf/makeLINT.mk b/sys/conf/makeLINT.mk
index 2a6968e..64392c6 100644
--- a/sys/conf/makeLINT.mk
+++ b/sys/conf/makeLINT.mk
@@ -23,6 +23,7 @@ LINT: ${NOTES} ../../conf/makeLINT.sed
echo "nodevice gre" >> ${.TARGET}-NOINET
echo "include ${.TARGET}" > ${.TARGET}-NOINET6
echo "ident ${.TARGET}-NOINET6" >> ${.TARGET}-NOINET6
+ echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOINET6
echo "nooptions INET6" >> ${.TARGET}-NOINET6
echo "include ${.TARGET}" > ${.TARGET}-NOIP
echo "ident ${.TARGET}-NOIP" >> ${.TARGET}-NOIP
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 44d74fe..cd523ca 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin; do
svnversion=${dir}/svnversion
break
fi
- if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
- git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
- break
- fi
done
+if [ -d "${SYSDIR}/../.git" ] ; then
+ for dir in /bin /usr/bin /usr/local/bin; do
+ if [ -x "${dir}/git" ] ; then
+ git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
+ break
+ fi
+ done
+fi
if [ -n "$svnversion" ] ; then
svn=`cd ${SYSDIR} && $svnversion`
diff --git a/sys/conf/options b/sys/conf/options
index 12dbc81..4c95967 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -103,6 +103,7 @@ GEOM_PART_BSD opt_geom.h
GEOM_PART_EBR opt_geom.h
GEOM_PART_EBR_COMPAT opt_geom.h
GEOM_PART_GPT opt_geom.h
+GEOM_PART_LDM opt_geom.h
GEOM_PART_MBR opt_geom.h
GEOM_PART_PC98 opt_geom.h
GEOM_PART_VTOC8 opt_geom.h
@@ -112,6 +113,7 @@ GEOM_RAID3 opt_geom.h
GEOM_SHSEC opt_geom.h
GEOM_STRIPE opt_geom.h
GEOM_SUNLABEL opt_geom.h
+GEOM_UNCOMPRESS opt_geom.h
GEOM_UZIP opt_geom.h
GEOM_VIRSTOR opt_geom.h
GEOM_VOL opt_geom.h
@@ -185,6 +187,7 @@ SYSVSEM opt_sysvipc.h
SYSVSHM opt_sysvipc.h
SW_WATCHDOG opt_watchdog.h
TURNSTILE_PROFILING
+UMTX_PROFILING
VFS_AIO
VFS_ALLOW_NONMPSAFE
VERBOSE_SYSINIT opt_global.h
@@ -777,6 +780,7 @@ ATH_DIAGAPI opt_ath.h
ATH_TX99_DIAG opt_ath.h
ATH_ENABLE_11N opt_ath.h
ATH_ENABLE_DFS opt_ath.h
+ATH_EEPROM_FIRMWARE opt_ath.h
# options for the Atheros hal
AH_SUPPORT_AR5416 opt_ah.h
@@ -826,6 +830,7 @@ DCONS_FORCE_GDB opt_dcons.h
# HWPMC options
HWPMC_HOOKS
+HWPMC_MIPS_BACKTRACE opt_hwpmc_hooks.h
# XBOX options for FreeBSD/i386, but some files are MI
XBOX opt_xbox.h
@@ -833,6 +838,8 @@ XBOX opt_xbox.h
# XFS
XFS
+ZFS opt_dontuse.h
+
# Interrupt filtering
INTR_FILTER
@@ -844,6 +851,7 @@ IEEE80211_SUPPORT_MESH opt_wlan.h
IEEE80211_SUPPORT_SUPERG opt_wlan.h
IEEE80211_SUPPORT_TDMA opt_wlan.h
IEEE80211_ALQ opt_wlan.h
+IEEE80211_DFS_DEBUG opt_wlan.h
# 802.11 TDMA support
TDMA_SLOTLEN_DEFAULT opt_tdma.h
@@ -886,6 +894,7 @@ OFED opt_ofed.h
OFED_DEBUG_INIT opt_ofed.h
SDP opt_ofed.h
SDP_DEBUG opt_ofed.h
+IPOIB opt_ofed.h
IPOIB_DEBUG opt_ofed.h
IPOIB_CM opt_ofed.h
@@ -898,6 +907,7 @@ RCTL opt_global.h
# At least one of the AR71XX ubiquiti boards has a Redboot configuration
# that "lies" about the amount of RAM it has. Until a cleaner method is
# defined, this option will suffice in overriding what Redboot says.
-AR71XX_REALMEM opt_global.h
-AR71XX_ENV_UBOOT opt_global.h
-AR71XX_ENV_REDBOOT opt_global.h
+AR71XX_REALMEM opt_ar71xx.h
+AR71XX_ENV_UBOOT opt_ar71xx.h
+AR71XX_ENV_REDBOOT opt_ar71xx.h
+AR71XX_ATH_EEPROM opt_ar71xx.h
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 87960d0..31d1650 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -7,10 +7,10 @@ COUNT_XINVLTLB_HITS opt_smp.h
COUNT_IPIS opt_smp.h
MAXMEM
PERFMON
-PMAP_SHPGPERPROC opt_pmap.h
MPTABLE_FORCE_HTT
MP_WATCHDOG
NKPT opt_pmap.h
+PV_STATS opt_pmap.h
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
@@ -65,3 +65,6 @@ KDTRACE_FRAME opt_kdtrace.h
BPF_JITTER opt_bpf.h
XENHVM opt_global.h
+
+# options for the Intel C600 SAS driver (isci)
+ISCI_LOGGING opt_isci.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 3f9df6b..bbe7f12 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -23,6 +23,7 @@ KERNPHYSADDR opt_global.h
KERNVIRTADDR opt_global.h
LOADERRAMADDR opt_global.h
PHYSADDR opt_global.h
+QEMU_WORKAROUNDS opt_global.h
SKYEYE_WORKAROUNDS opt_global.h
SOC_MV_DISCOVERY opt_global.h
SOC_MV_KIRKWOOD opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index dd888b1..3638266 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -16,6 +16,7 @@ NKPT opt_pmap.h
PERFMON
PMAP_SHPGPERPROC opt_pmap.h
POWERFAIL_NMI opt_trap.h
+PV_STATS opt_pmap.h
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
@@ -119,3 +120,6 @@ BPF_JITTER opt_bpf.h
NATIVE opt_global.h
XEN opt_global.h
XENHVM opt_global.h
+
+# options for the Intel C600 SAS driver (isci)
+ISCI_LOGGING opt_isci.h
diff --git a/sys/conf/options.mips b/sys/conf/options.mips
index 0384283..237b472 100644
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
@@ -38,12 +38,7 @@ CPU_CNMIPS opt_global.h
CPU_RMI opt_global.h
CPU_NLM opt_global.h
-ISA_MIPS1 opt_cputype.h
-ISA_MIPS3 opt_cputype.h
-ISA_MIPS32 opt_cputype.h
-ISA_MIPS32v2 opt_cputype.h
-ISA_MIPS64 opt_cputype.h
-ISA_MIPS64v2 opt_cputype.h
+COMPAT_FREEBSD32 opt_compat.h
YAMON opt_global.h
CFE opt_global.h
OpenPOWER on IntegriCloud