[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Fri Mar 2 15:40:24 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/ff9b7f9bab8d
changeset: 411:ff9b7f9bab8d
user: ray at terran.dlink.ua
date: Fri Mar 02 17:25:47 2012 +0200
description:
Update to FreeBSD-HEAD @232391
diffstat:
head/sys/conf/Makefile.amd64 | 13 +-
head/sys/conf/Makefile.i386 | 9 +-
head/sys/conf/NOTES | 32 +-
head/sys/conf/WITHOUT_SOURCELESS | 7 +
head/sys/conf/WITHOUT_SOURCELESS_HOST | 10 +
head/sys/conf/WITHOUT_SOURCELESS_UCODE | 41 ++++
head/sys/conf/files | 331 +++++++++++++++++---------------
head/sys/conf/files.powerpc | 4 +-
head/sys/conf/kern.mk | 9 +-
head/sys/conf/kern.pre.mk | 10 +-
head/sys/conf/kmod.mk | 6 +-
head/sys/conf/newvers.sh | 14 +-
12 files changed, 286 insertions(+), 200 deletions(-)
diffs (847 lines):
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/Makefile.amd64
--- a/head/sys/conf/Makefile.amd64 Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/Makefile.amd64 Fri Mar 02 17:25:47 2012 +0200
@@ -2,7 +2,7 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD$
+# $FreeBSD: head/sys/conf/Makefile.amd64 232263 2012-02-28 18:30:18Z dim $
#
# Makefile for FreeBSD
#
@@ -40,13 +40,12 @@
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 -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/Makefile.i386
--- a/head/sys/conf/Makefile.i386 Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/Makefile.i386 Fri Mar 02 17:25:47 2012 +0200
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: head/sys/conf/Makefile.i386 232263 2012-02-28 18:30:18Z dim $
#
# Makefile for FreeBSD
#
@@ -34,11 +34,10 @@
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 -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/NOTES
--- a/head/sys/conf/NOTES Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/NOTES Fri Mar 02 17:25:47 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/NOTES 229997 2012-01-12 00:34:33Z ken $
+# $FreeBSD: head/sys/conf/NOTES 232337 2012-03-01 13:10:18Z mav $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -219,19 +219,19 @@
# 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
@@ -437,7 +437,7 @@
# 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 +602,7 @@
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 +1269,7 @@
# 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.
@@ -1434,7 +1434,7 @@
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
@@ -1835,7 +1835,7 @@
# 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.
#
@@ -1972,6 +1972,7 @@
# 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
@@ -2112,6 +2113,7 @@
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'')
@@ -2255,6 +2257,7 @@
# 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.
@@ -2294,6 +2297,7 @@
device snd_fm801
device snd_gusc
device snd_hda
+device snd_hdspe
device snd_ich
device snd_maestro
device snd_maestro3
@@ -2333,7 +2337,7 @@
# 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
@@ -2415,18 +2419,18 @@
# 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.
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/WITHOUT_SOURCELESS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/conf/WITHOUT_SOURCELESS Fri Mar 02 17:25:47 2012 +0200
@@ -0,0 +1,7 @@
+#
+# WITHOUT_SOURCELESS -- Disable drivers that include sourceless code.
+#
+# $FreeBSD: head/sys/conf/WITHOUT_SOURCELESS 231559 2012-02-12 14:55:27Z rmh $
+
+include WITHOUT_SOURCELESS_HOST
+include WITHOUT_SOURCELESS_UCODE
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/WITHOUT_SOURCELESS_HOST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/conf/WITHOUT_SOURCELESS_HOST Fri Mar 02 17:25:47 2012 +0200
@@ -0,0 +1,10 @@
+#
+# WITHOUT_SOURCELESS_HOST -- Disable drivers that include sourceless
+# native code for host CPU.
+#
+# $FreeBSD: head/sys/conf/WITHOUT_SOURCELESS_HOST 231565 2012-02-12 19:29:34Z rmh $
+
+nodevice hpt27xx
+nodevice hptmv
+nodevice hptrr
+nodevice nve
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/WITHOUT_SOURCELESS_UCODE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/conf/WITHOUT_SOURCELESS_UCODE Fri Mar 02 17:25:47 2012 +0200
@@ -0,0 +1,41 @@
+#
+# WITHOUT_SOURCELESS_UCODE -- Disable drivers that include sourceless
+# microcode.
+#
+# $FreeBSD: head/sys/conf/WITHOUT_SOURCELESS_UCODE 231559 2012-02-12 14:55:27Z rmh $
+
+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 -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/files
--- a/head/sys/conf/files Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/files Fri Mar 02 17:25:47 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/files 230775 2012-01-30 16:42:02Z jfv $
+# $FreeBSD: head/sys/conf/files 232337 2012-03-01 13:10:18Z mav $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -153,155 +153,157 @@
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/utaddress.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 \
@@ -772,6 +774,10 @@
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 \
@@ -883,6 +889,8 @@
dev/bwi/if_bwi.c optional bwi
dev/bwi/if_bwi_pci.c optional bwi pci
dev/bwn/if_bwn.c optional bwn siba_bwn
+dev/bxe/if_bxe.c optional bxe
+dev/bxe/bxe_link.c optional bxe
dev/cardbus/cardbus.c optional cardbus
dev/cardbus/cardbus_cis.c optional cardbus
dev/cardbus/cardbus_device.c optional cardbus
@@ -1553,6 +1561,12 @@
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
@@ -1743,8 +1757,7 @@
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
@@ -1770,6 +1783,8 @@
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
@@ -2433,9 +2448,8 @@
kern/serdev_if.m standard
kern/stack_protector.c standard \
compile-with "${NORMAL_C:N-fstack-protector*}"
-# XXX subr_acl_nfs4.c is also used by ZFS
-kern/subr_acl_nfs4.c optional ufs_acl
-kern/subr_acl_posix1e.c optional ufs_acl
+kern/subr_acl_nfs4.c standard
+kern/subr_acl_posix1e.c standard
kern/subr_autoconf.c standard
kern/subr_blist.c standard
kern/subr_bus.c standard
@@ -2528,17 +2542,17 @@
#
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
@@ -3559,6 +3573,7 @@
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 -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/files.powerpc
--- a/head/sys/conf/files.powerpc Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/files.powerpc Fri Mar 02 17:25:47 2012 +0200
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.powerpc 226449 2011-10-16 21:01:42Z nwhitehorn $
+# $FreeBSD: head/sys/conf/files.powerpc 232177 2012-02-26 13:45:25Z jhibbits $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -133,6 +133,7 @@
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 +145,7 @@
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
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/kern.mk
--- a/head/sys/conf/kern.mk Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/kern.mk Fri Mar 02 17:25:47 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/kern.mk 228994 2011-12-30 13:16:59Z dim $
+# $FreeBSD: head/sys/conf/kern.mk 232322 2012-02-29 22:58:51Z dim $
#
# Warning flags for compiling the kernel and components of the kernel:
@@ -15,13 +15,14 @@
# 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
# 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.
@@ -49,7 +50,7 @@
# -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
#
.if ${MACHINE_CPUARCH} == "i386"
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
.else
CFLAGS+= -mno-aes -mno-avx
@@ -97,7 +98,7 @@
# (-mfpmath= is not supported)
#
.if ${MACHINE_CPUARCH} == "amd64"
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -mno-sse
.else
CFLAGS+= -mno-aes -mno-avx
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/kern.pre.mk
--- a/head/sys/conf/kern.pre.mk Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/kern.pre.mk Fri Mar 02 17:25:47 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/kern.pre.mk 230422 2012-01-21 11:42:40Z andreast $
+# $FreeBSD: head/sys/conf/kern.pre.mk 232322 2012-02-29 22:58:51Z dim $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -34,7 +34,7 @@
.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 @@
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 @@
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
+.if ${CC:T:Mclang} == "clang"
+CLANG_NO_IAS= -no-integrated-as
+.endif
+
.if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
CFLAGS+= -DGPROF -falign-functions=16
.if ${PROFLEVEL} >= 2
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/kmod.mk
--- a/head/sys/conf/kmod.mk Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/kmod.mk Fri Mar 02 17:25:47 2012 +0200
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: head/sys/conf/kmod.mk 230308 2012-01-18 15:25:34Z bz $
+# $FreeBSD: head/sys/conf/kmod.mk 232322 2012-02-29 22:58:51Z dim $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -108,7 +108,7 @@
# 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
@@ -351,7 +351,7 @@
dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \
dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \
dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \
- kern/bus_if.m kern/clock_if.m \
+ dev/spibus/spibus_if.m kern/bus_if.m kern/clock_if.m \
kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \
libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \
pc98/pc98/canbus_if.m
diff -r 1d30d2c6524b -r ff9b7f9bab8d head/sys/conf/newvers.sh
--- a/head/sys/conf/newvers.sh Fri Mar 02 17:22:09 2012 +0200
+++ b/head/sys/conf/newvers.sh Fri Mar 02 17:25:47 2012 +0200
@@ -28,7 +28,7 @@
# SUCH DAMAGE.
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
-# $FreeBSD: head/sys/conf/newvers.sh 228148 2011-11-29 21:28:48Z jhb $
+# $FreeBSD: head/sys/conf/newvers.sh 231558 2012-02-12 14:54:19Z avg $
TYPE="FreeBSD"
REVISION="10.0"
@@ -92,11 +92,15 @@
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`
More information about the Zrouter-src-freebsd
mailing list