[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:22 UTC 2012


details:   http://zrouter.org/hg/FreeBSD/head//rev/1d30d2c6524b
changeset: 410:1d30d2c6524b
user:      ray at terran.dlink.ua
date:      Fri Mar 02 17:22:09 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/sys/modules/Makefile                       |  77 +++++++++++++++++++++---
 head/sys/modules/acpi/acpi/Makefile             |  28 ++++----
 head/sys/modules/ath/Makefile                   |   6 +-
 head/sys/modules/bios/smapi/Makefile            |  10 +-
 head/sys/modules/drm/Makefile                   |  19 ++++-
 head/sys/modules/hpt27xx/Makefile               |   5 +-
 head/sys/modules/ipdivert/Makefile              |   4 +-
 head/sys/modules/isci/Makefile                  |   4 +-
 head/sys/modules/kgssapi/Makefile               |   8 +-
 head/sys/modules/kgssapi_krb5/Makefile          |   4 +-
 head/sys/modules/linux/Makefile                 |  11 +-
 head/sys/modules/mii/Makefile                   |   4 +-
 head/sys/modules/oce/Makefile                   |  15 ++++
 head/sys/modules/ral/Makefile                   |   3 +
 head/sys/modules/scc/Makefile                   |   4 +-
 head/sys/modules/sound/driver/Makefile          |  19 ++++-
 head/sys/modules/sound/driver/emu10k1/Makefile  |   7 +-
 head/sys/modules/sound/driver/emu10kx/Makefile  |   6 +-
 head/sys/modules/sound/driver/hdspe/Makefile    |   9 ++
 head/sys/modules/sound/driver/maestro3/Makefile |   3 +-
 head/sys/modules/usb/Makefile                   |  18 ++++-
 head/sys/modules/wi/Makefile                    |   5 +-
 head/sys/modules/wlan/Makefile                  |   6 +-
 23 files changed, 194 insertions(+), 81 deletions(-)

diffs (758 lines):

diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/Makefile
--- a/head/sys/modules/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,7 +1,10 @@
-# $FreeBSD: head/sys/modules/Makefile 230859 2012-02-01 03:42:14Z jhibbits $
+# $FreeBSD: head/sys/modules/Makefile 231437 2012-02-10 21:03:04Z luigi $
 
 .include <bsd.own.mk>
 
+# Modules that include binary-only blobs of microcode should be selectable by
+# MK_SOURCELESS_UCODE option (see below).
+
 SUBDIR=	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
@@ -95,13 +98,13 @@
 	${_ex} \
 	${_exca} \
 	${_ext2fs} \
-	fatm \
+	${_fatm} \
 	fdc \
 	fdescfs \
 	${_fe} \
 	firewire \
 	firmware \
-	fxp \
+	${_fxp} \
 	gem \
 	geom \
 	${_glxiic} \
@@ -148,7 +151,7 @@
 	${_isci} \
 	iscsi \
 	isp \
-	ispfw \
+	${_ispfw} \
 	${_iwi} \
 	${_iwifw} \
 	${_iwn} \
@@ -210,7 +213,7 @@
 	${_mthca} \
 	mvs \
 	mwl \
-	mwlfw \
+	${_mwlfw} \
 	mxge \
 	my \
 	${_ncp} \
@@ -238,6 +241,7 @@
 	${_nwfs} \
 	${_nxge} \
 	${_opensolaris} \
+	oce \
 	${_padlock} \
 	patm \
 	${_pccard} \
@@ -260,14 +264,14 @@
 	puc \
 	${_qlxgb} \
 	ral \
-	ralfw \
+	${_ralfw} \
 	${_random} \
 	rc4 \
 	${_rdma} \
 	re \
 	reiserfs \
 	rl \
-	runfw \
+	${_runfw} \
 	${_s3} \
 	${_safe} \
 	${_sbni} \
@@ -277,7 +281,7 @@
 	sdhci \
 	sem \
 	send \
-	sf \
+	${_sf} \
 	${_sfxge} \
 	sge \
 	${_siba_bwn} \
@@ -286,7 +290,7 @@
 	sis \
 	sk \
 	${_smbfs} \
-	sn \
+	${_sn} \
 	${_snc} \
 	snp \
 	${_sound} \
@@ -301,7 +305,7 @@
 	${_sym} \
 	${_syscons} \
 	sysvipc \
-	ti \
+	${_ti} \
 	tl \
 	tmpfs \
 	${_tpm} \
@@ -310,7 +314,7 @@
 	twe \
 	tws \
 	tx \
-	txp \
+	${_txp} \
 	${_uart} \
 	ubsec \
 	udf \
@@ -366,8 +370,10 @@
 # No barrier instruction support (specific to this driver)
 _sym=		sym
 # intr_disable() is a macro, causes problems
+.if ${MK_SOURCELESS_UCODE} != "no"
 _cxgb=		cxgb
 .endif
+.endif
 
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${.CURDIR}/../opencrypto)
@@ -410,6 +416,20 @@
 .endif
 .endif
 
+.if ${MK_SOURCELESS_UCODE} != "no"
+_bce=		bce
+_fatm=		fatm
+_fxp=		fxp
+_ispfw=		ispfw
+_mwlfw=		mwlfw
+_ralfw=		ralfw
+_runfw=		runfw
+_sf=		sf
+_sn=		sn
+_ti=		ti
+_txp=		txp
+.endif
+
 .if ${MACHINE_CPUARCH} == "i386"
 # XXX some of these can move to the general case when de-i386'ed
 # XXX some of these can move now, but are untested on other architectures.
@@ -425,9 +445,13 @@
 _bxe=		bxe
 _cardbus=	cardbus
 _cbb=		cbb
+.if ${MK_SOURCELESS_UCODE} != "no"
 _ce=		ce
+.endif
 _coff=		coff
+.if ${MK_SOURCELESS_UCODE} != "no"
 _cp=		cp
+.endif
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _cs=		cs
@@ -516,36 +540,52 @@
 _cm=		cm
 _cmx=		cmx
 _coretemp=	coretemp
+.if ${MK_SOURCELESS_UCODE} != "no"
 _ctau=		ctau
+.endif
 _dpt=		dpt
 _ex=		ex
+.if ${MK_SOURCELESS_HOST} != "no"
 _hpt27xx=	hpt27xx
+.endif
 _hptiop=	hptiop
+.if ${MK_SOURCELESS_HOST} != "no"
 _hptmv=		hptmv
 _hptrr=		hptrr
+.endif
 _ichwd=		ichwd
 _ida=		ida
 _iir=		iir
 _ipmi=		ipmi
 _ips=		ips
 _ipw=		ipw
+.if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
+.endif
 _isci=		isci
 _iwi=		iwi
+.if ${MK_SOURCELESS_UCODE} != "no"
 _iwifw=		iwifw
+.endif
 _iwn=		iwn
+.if ${MK_SOURCELESS_UCODE} != "no"
 _iwnfw=		iwnfw
+.endif
 _ixgb=		ixgb
 _ixgbe=		ixgbe
 _mly=		mly
 _nfe=		nfe
+.if ${MK_SOURCELESS_HOST} != "no"
 _nve=		nve
+.endif
 _nvram=		nvram
 _nxge=		nxge
 _tpm=		tpm
 _viawd=		viawd
 _wpi=		wpi
+.if ${MK_SOURCELESS_UCODE} != "no"
 _wpifw=		wpifw
+.endif
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _padlock=	padlock
 .endif
@@ -597,10 +637,14 @@
 _em=		em
 _exca=		exca
 _ext2fs=	ext2fs
+.if ${MK_SOURCELESS_HOST} != "no"
 _hpt27xx=	hpt27xx
+.endif
 _hptiop=	hptiop
+.if ${MK_SOURCELESS_HOST} != "no"
 _hptmv=		hptmv
 _hptrr=		hptrr
+.endif
 _i2c=		i2c
 _ichwd=		ichwd
 _ida=		ida
@@ -611,12 +655,18 @@
 _ipmi=		ipmi
 _ips=		ips
 _ipw=		ipw
+.if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
+.endif
 _isci=		isci
 _iwi=		iwi
+.if ${MK_SOURCELESS_UCODE} != "no"
 _iwifw=		iwifw
+.endif
 _iwn=		iwn
+.if ${MK_SOURCELESS_UCODE} != "no"
 _iwnfw=		iwnfw
+.endif
 _ixgb=		ixgb
 _ixgbe=		ixgbe
 _lindev=	lindev
@@ -632,7 +682,9 @@
 .endif
 _ndis=		ndis
 _nfe=		nfe
+.if ${MK_SOURCELESS_HOST} != "no"
 _nve=		nve
+.endif
 _nvram=		nvram
 _nxge=		nxge
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
@@ -662,7 +714,9 @@
 _x86bios=	x86bios
 _wi=		wi
 _wpi=		wpi
+.if ${MK_SOURCELESS_UCODE} != "no"
 _wpifw=		wpifw
+.endif
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 _zfs=		zfs
 .endif
@@ -719,6 +773,7 @@
 _cbb=		cbb
 _cfi=		cfi
 _cpufreq=	cpufreq
+_exca=		exca
 _nvram=		powermac_nvram
 _pccard=	pccard
 _smbfs=		smbfs
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/acpi/acpi/Makefile
--- a/head/sys/modules/acpi/acpi/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/acpi/acpi/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/acpi/acpi/Makefile 229989 2012-01-11 23:06:37Z jkim $
+# $FreeBSD: head/sys/modules/acpi/acpi/Makefile 231844 2012-02-16 22:59:29Z jkim $
 
 .if !defined(FORCE_BUILD)
 .error "The ACPI module is deprecated, set FORCE_BUILD to force it"
@@ -12,17 +12,17 @@
 .error "The ACPI module is only for amd64 and i386"
 .endif
 
-.PATH:	${.CURDIR}/../../../contrib/dev/acpica/debugger \
-	${.CURDIR}/../../../contrib/dev/acpica/disassembler \
-	${.CURDIR}/../../../contrib/dev/acpica/dispatcher \
-	${.CURDIR}/../../../contrib/dev/acpica/events \
-	${.CURDIR}/../../../contrib/dev/acpica/executer \
-	${.CURDIR}/../../../contrib/dev/acpica/hardware \
-	${.CURDIR}/../../../contrib/dev/acpica/namespace \
-	${.CURDIR}/../../../contrib/dev/acpica/parser \
-	${.CURDIR}/../../../contrib/dev/acpica/resources \
-	${.CURDIR}/../../../contrib/dev/acpica/tables \
-	${.CURDIR}/../../../contrib/dev/acpica/utilities \
+.PATH:	${.CURDIR}/../../../contrib/dev/acpica/components/debugger \
+	${.CURDIR}/../../../contrib/dev/acpica/components/disassembler \
+	${.CURDIR}/../../../contrib/dev/acpica/components/dispatcher \
+	${.CURDIR}/../../../contrib/dev/acpica/components/events \
+	${.CURDIR}/../../../contrib/dev/acpica/components/executer \
+	${.CURDIR}/../../../contrib/dev/acpica/components/hardware \
+	${.CURDIR}/../../../contrib/dev/acpica/components/namespace \
+	${.CURDIR}/../../../contrib/dev/acpica/components/parser \
+	${.CURDIR}/../../../contrib/dev/acpica/components/resources \
+	${.CURDIR}/../../../contrib/dev/acpica/components/tables \
+	${.CURDIR}/../../../contrib/dev/acpica/components/utilities \
 	${.CURDIR}/../../../pci \
 	${.CURDIR}/../../../dev/acpica \
 	${.CURDIR}/../../../dev/acpica/Osd \
@@ -45,8 +45,8 @@
 SRCS+=	exfldio.c exmisc.c exmutex.c exnames.c exoparg1.c exoparg2.c
 SRCS+=	exoparg3.c exoparg6.c exprep.c exregion.c exresnte.c exresolv.c
 SRCS+=	exresop.c exstore.c exstoren.c exstorob.c exsystem.c exutils.c
-SRCS+=	hwacpi.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwtimer.c hwvalid.c
-SRCS+=	hwxface.c
+SRCS+=	hwacpi.c hwesleep.c hwgpe.c hwpci.c hwregs.c hwsleep.c hwtimer.c
+SRCS+=	hwvalid.c hwxface.c hwxfsleep.c
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c nsnames.c
 SRCS+=	nsobject.c nsparse.c nspredef.c nsrepair.c nsrepair2.c nssearch.c
 SRCS+=	nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/ath/Makefile
--- a/head/sys/modules/ath/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/ath/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -26,7 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD: head/sys/modules/ath/Makefile 229560 2012-01-05 06:22:09Z adrian $
+# $FreeBSD: head/sys/modules/ath/Makefile 231927 2012-02-20 03:07:07Z adrian $
 #
 
 ATH_RATE?=	sample		# tx rate control algorithm
@@ -88,8 +88,8 @@
 	ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \
 	ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \
 	ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \
-	ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \
-	ar5416_reset.c ar5416_xmit.c
+	ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_radar.c \
+	ar5416_recv.c ar5416_reset.c ar5416_xmit.c
 
 # RF backend for 5416, 9130 and 9160
 SRCS+=	ar2133.c
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/bios/smapi/Makefile
--- a/head/sys/modules/bios/smapi/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/bios/smapi/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/bios/smapi/Makefile 232263 2012-02-28 18:30:18Z dim $
 #
 
 .PATH:  ${.CURDIR}/../../../i386/bios
@@ -7,9 +7,9 @@
 SRCS=	smapi.c smapi_bios.S \
 	bus_if.h device_if.h
 WERROR=
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok 16-bit assembly yet
-CFLAGS+=	${.IMPSRC:T:Msmapi_bios.S:C/^.+$/-no-integrated-as/}
-.endif
 
 .include <bsd.kmod.mk>
+
+# XXX: clang integrated-as doesn't grok 16-bit assembly yet
+CFLAGS.smapi_bios.S=	${CLANG_NO_IAS}
+CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/drm/Makefile
--- a/head/sys/modules/drm/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/drm/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,15 +1,26 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/drm/Makefile 230972 2012-02-04 00:54:43Z rmh $
+
+.include <bsd.own.mk>
+
+# Modules that include binary-only blobs of microcode should be selectable by
+# MK_SOURCELESS_UCODE option (see below).
 
 SUBDIR = \
 	drm \
 	i915 \
 	mach64 \
-	mga \
-	r128 \
-	radeon \
+	${_mga} \
+	${_r128} \
+	${_radeon} \
 	savage \
 	sis \
 	tdfx \
 	via
 
+.if ${MK_SOURCELESS_UCODE} != "no"
+_mga=		mga
+_r128=		r128
+_radeon=	radeon
+.endif
+
 .include <bsd.subdir.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/hpt27xx/Makefile
--- a/head/sys/modules/hpt27xx/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/hpt27xx/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/hpt27xx/Makefile 228940 2011-12-28 23:26:58Z delphij $
+# $FreeBSD: head/sys/modules/hpt27xx/Makefile 231982 2012-02-21 21:20:52Z dim $
 HPT27XX=	${.CURDIR}/../../dev/hpt27xx
 .PATH:	${HPT27XX}
 
@@ -12,3 +12,6 @@
 	uudecode -p < ${HPT27XX}/$(MACHINE_ARCH)-elf.hpt27xx_lib.o.uu > ${.TARGET}
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.osm_bsd.c=	${NO_WFORMAT_SECURITY}
+CWARNFLAGS+=		${CWARNFLAGS.${.IMPSRC:T}}
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/ipdivert/Makefile
--- a/head/sys/modules/ipdivert/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/ipdivert/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,11 +1,11 @@
-# $FreeBSD: head/sys/modules/ipdivert/Makefile 230443 2012-01-22 02:16:31Z bz $
+# $FreeBSD: head/sys/modules/ipdivert/Makefile 231838 2012-02-16 21:57:50Z uqs $
 
 .include <bsd.own.mk>
 
 .PATH: ${.CURDIR}/../../netinet
 
 KMOD=   ipdivert
-SRCS=   ip_divert.c opt_inet.h opt_inet6.h
+SRCS=   ip_divert.c opt_inet.h opt_inet6.h opt_sctp.h
 
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET_SUPPORT} != "no"
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/isci/Makefile
--- a/head/sys/modules/isci/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/isci/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,6 +1,6 @@
 # isci driver Makefile
 #
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/isci/Makefile 231296 2012-02-09 17:50:24Z jimharris $
 
 ISCI_SRC_PATH = ${.CURDIR}/../..
 
@@ -87,6 +87,4 @@
 SRCS += opt_scsi.h opt_cam.h opt_isci.h
 SRCS += device_if.h bus_if.h pci_if.h
 
-CC	= gcc
-
 .include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/kgssapi/Makefile
--- a/head/sys/modules/kgssapi/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/kgssapi/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/kgssapi/Makefile 231118 2012-02-07 09:27:07Z dim $
 
 .PATH: ${.CURDIR}/../../kgssapi ${.CURDIR}/../../rpc/rpcsec_gss
 KMOD=	kgssapi
@@ -44,12 +44,12 @@
 S=		${.CURDIR}/../..
 
 gssd.h:		$S/kgssapi/gssd.x
-	rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h
+	RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h
 
 gssd_xdr.c:	$S/kgssapi/gssd.x
-	rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c
+	RPCGEN_CPP=${CPP:Q} rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c
 
 gssd_clnt.c:	$S/kgssapi/gssd.x
-	rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c
+	RPCGEN_CPP=${CPP:Q} rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c
 
 .include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/kgssapi_krb5/Makefile
--- a/head/sys/modules/kgssapi_krb5/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/kgssapi_krb5/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/kgssapi_krb5/Makefile 229519 2012-01-04 21:14:22Z jhb $
+# $FreeBSD: head/sys/modules/kgssapi_krb5/Makefile 231118 2012-02-07 09:27:07Z dim $
 
 .PATH: ${.CURDIR}/../../kgssapi/krb5
 KMOD=	kgssapi_krb5
@@ -18,6 +18,6 @@
 S=		${.CURDIR}/../..
 
 gssd.h:		$S/kgssapi/gssd.x
-	rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h
+	RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h
 
 .include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/linux/Makefile
--- a/head/sys/modules/linux/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/linux/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,15 +1,10 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/linux/Makefile 232263 2012-02-28 18:30:18Z dim $
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SFX= 32
 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
 .endif
 
-.if ${CC:T:Mclang} == "clang"
-# XXX: clang integrated-as doesn't grok .codeNN directives yet
-CFLAGS+=	${.IMPSRC:T:Mlinux32_locore.s:C/^.+$/-no-integrated-as/}
-.endif
-
 .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}
 
 KMOD=	linux
@@ -69,3 +64,7 @@
 .endif
 
 .include <bsd.kmod.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.linux32_locore.s=	${CLANG_NO_IAS}
+CFLAGS+=			${CFLAGS.${.IMPSRC:T}}
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/mii/Makefile
--- a/head/sys/modules/mii/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/mii/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/mii/Makefile 226995 2011-11-01 16:13:59Z marius $
+# $FreeBSD: head/sys/modules/mii/Makefile 232016 2012-02-23 01:22:40Z yongari $
 
 .PATH: ${.CURDIR}/../../dev/mii
 
@@ -8,7 +8,7 @@
 SRCS+=	e1000phy.c gentbi.c icsphy.c ip1000phy.c jmphy.c lxtphy.c
 SRCS+=	miibus_if.c miibus_if.h mii.c miidevs.h mii_bitbang.c mii_physubr.c
 SRCS+=	mlphy.c nsgphy.c nsphy.c nsphyter.c pci_if.h pnaphy.c qsphy.c
-SRCS+=	rdcphy.c rgephy.c rlphy.c tdkphy.c tlphy.c truephy.c
+SRCS+=	rdcphy.c rgephy.c rlphy.c smcphy.c tdkphy.c tlphy.c truephy.c
 SRCS+=	ukphy.c ukphy_subr.c
 SRCS+=	xmphy.c
 
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/oce/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/oce/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -0,0 +1,15 @@
+#
+# $FreeBSD: head/sys/modules/oce/Makefile 231512 2012-02-11 08:34:33Z bz $
+#
+
+.PATH:	${.CURDIR}/../../dev/oce
+KMOD	= oce
+SRCS    = oce_if.c oce_hw.c oce_mbox.c oce_util.c oce_queue.c oce_sysctl.c
+SRCS    += bus_if.h device_if.h pci_if.h opt_inet.h opt_inet6.h
+
+CFLAGS+= -I${.CURDIR}/../../dev/oce -DSMP
+
+# uncomment for lock profiling statistics
+#CFLAGS  += -DLOCK_PROFILING
+
+.include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/ral/Makefile
--- a/head/sys/modules/ral/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/ral/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -5,5 +5,8 @@
 KMOD=	if_ral
 SRCS=	rt2560.c rt2661.c if_ral_pci.c
 SRCS+=	device_if.h bus_if.h pci_if.h
+# Ralink RT2860 Family
+SRCS+=	rt2860.c
+
 
 .include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/scc/Makefile
--- a/head/sys/modules/scc/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/scc/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/scc/Makefile 232176 2012-02-26 13:27:22Z jhibbits $
 
 .PATH: ${.CURDIR}/../../dev/scc
 
@@ -6,7 +6,7 @@
 scc_bfe= scc_bfe_ebus.c scc_bfe_sbus.c
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
-scc_bfe= scc_bfe_macio.c scc_bfe_quicc.c
+scc_bfe= scc_bfe_macio.c scc_bfe_quicc.c scc_dev_quicc.c
 .endif
 
 KMOD=	scc
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/sound/driver/Makefile
--- a/head/sys/modules/sound/driver/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/sound/driver/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,10 +1,21 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/sound/driver/Makefile 232337 2012-03-01 13:10:18Z mav $
 
-SUBDIR=		ad1816 als4000 atiixp cs4281 csa ds1 emu10k1 emu10kx
-SUBDIR+=	envy24 envy24ht es137x ess fm801 hda ich maestro maestro3
-SUBDIR+=	neomagic sb16 sb8 sbc solo spicds t4dwave via8233
+.include <bsd.own.mk>
+
+# Modules that include binary-only blobs of microcode should be selectable by
+# MK_SOURCELESS_UCODE option (see below).
+
+SUBDIR=		ad1816 als4000 atiixp cs4281 ${_csa} ${_ds1} emu10k1 emu10kx
+SUBDIR+=	envy24 envy24ht es137x ess fm801 hda hdspe ich maestro
+SUBDIR+=	${_maestro3} neomagic sb16 sb8 sbc solo spicds t4dwave via8233
 SUBDIR+=	via82c686 vibes driver uaudio
 
+.if ${MK_SOURCELESS_UCODE} != "no"
+_csa=		csa
+_ds1=		ds1
+_maestro3=	maestro3
+.endif
+
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SUBDIR+=	cmi mss
 .endif
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/sound/driver/emu10k1/Makefile
--- a/head/sys/modules/sound/driver/emu10k1/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/sound/driver/emu10k1/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,10 +1,9 @@
-# $FreeBSD: head/sys/modules/sound/driver/emu10k1/Makefile 229430 2012-01-03 21:04:54Z pfg $
+# $FreeBSD: head/sys/modules/sound/driver/emu10k1/Makefile 230915 2012-02-02 17:25:39Z joel $
 
-.PATH: ${.CURDIR}/../../../../dev/sound/pci \
-       ${.CURDIR}/../../../../gnu/dev/sound/pci
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_emu10k1
-SRCS=	device_if.h bus_if.h emuxkireg.h pci_if.h
+SRCS=	device_if.h bus_if.h pci_if.h
 SRCS+= mpufoi_if.h
 SRCS+=	emu10k1.c
 
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/sound/driver/emu10kx/Makefile
--- a/head/sys/modules/sound/driver/emu10kx/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/sound/driver/emu10kx/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,6 +1,5 @@
-# $FreeBSD: head/sys/modules/sound/driver/emu10kx/Makefile 229981 2012-01-11 21:17:14Z pfg $
-.PATH: ${.CURDIR}/../../../../dev/sound/pci \
-       ${.CURDIR}/../../../../gnu/dev/sound/pci
+# $FreeBSD: head/sys/modules/sound/driver/emu10kx/Makefile 230915 2012-02-02 17:25:39Z joel $
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_emu10kx
 
@@ -11,6 +10,5 @@
 SRCS+=	emu10kx.c
 SRCS+=	emu10kx-pcm.c
 SRCS+=	emu10kx-midi.c
-SRCS+=	emuxkireg.h
 
 .include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/sound/driver/hdspe/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/sound/driver/hdspe/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -0,0 +1,9 @@
+# $FreeBSD: head/sys/modules/sound/driver/hdspe/Makefile 232337 2012-03-01 13:10:18Z mav $
+
+.PATH: ${.CURDIR}/../../../../dev/sound/pci
+
+KMOD=	snd_hdspe
+SRCS=	device_if.h bus_if.h pci_if.h
+SRCS+=	hdspe.c hdspe-pcm.c hdspe.h
+
+.include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/sound/driver/maestro3/Makefile
--- a/head/sys/modules/sound/driver/maestro3/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/sound/driver/maestro3/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,10 +1,9 @@
-# $FreeBSD: head/sys/modules/sound/driver/maestro3/Makefile 230401 2012-01-20 22:37:10Z pfg $
+# $FreeBSD: head/sys/modules/sound/driver/maestro3/Makefile 230898 2012-02-02 00:10:20Z pfg $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_maestro3
 SRCS=	device_if.h bus_if.h pci_if.h
-SRCS+=	allegro_code.h allegro_reg.h
 SRCS+=	maestro3.c
 
 CFLAGS+= -Wall -DM3_DEBUG_LEVEL=-1
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/usb/Makefile
--- a/head/sys/modules/usb/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/usb/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/sys/modules/usb/Makefile 228483 2011-12-14 00:28:54Z hselasky $
+# $FreeBSD: head/sys/modules/usb/Makefile 230972 2012-02-04 00:54:43Z rmh $
 #
 # Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 #
@@ -25,16 +25,28 @@
 # SUCH DAMAGE.
 #
 
+.include <bsd.own.mk>
+
+# Modules that include binary-only blobs of microcode should be selectable by
+# MK_SOURCELESS_UCODE option (see below).
+
 SUBDIR = usb
 SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} ${_avr32dci}
-SUBDIR += rum run uath upgt usie ural zyd ${_urtw}
+SUBDIR += ${_rum} run ${_uath} upgt usie ural ${_zyd} ${_urtw}
 SUBDIR += atp uhid ukbd ums udbp ufm uep
 SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
 	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
-SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth
+SUBDIR += uether aue axe cdce cue ${_kue} mos rue udav uhso ipheth
 SUBDIR += usfs umass urio
 SUBDIR += quirk template
 
+.if ${MK_SOURCELESS_UCODE} != "no"
+_rum=		rum
+_uath=		uath
+_zyd=		zyd
+_kue=		kue
+.endif
+
 .if ${MACHINE_CPUARCH} == "amd64"
 _urtw=		urtw
 .endif
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/wi/Makefile
--- a/head/sys/modules/wi/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/wi/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/wi/Makefile 231838 2012-02-16 21:57:50Z uqs $
 
 .PATH: ${.CURDIR}/../../dev/wi
 
 KMOD=	if_wi
 SRCS=	if_wi.c if_wi_pccard.c if_wi_pci.c \
-	card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h
+	card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h \
+	opt_wlan.h
 
 .include <bsd.kmod.mk>
diff -r 7c73bb1cf6cc -r 1d30d2c6524b head/sys/modules/wlan/Makefile
--- a/head/sys/modules/wlan/Makefile	Fri Mar 02 17:21:04 2012 +0200
+++ b/head/sys/modules/wlan/Makefile	Fri Mar 02 17:22:09 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/wlan/Makefile 230153 2012-01-15 19:45:23Z adrian $
+# $FreeBSD: head/sys/modules/wlan/Makefile 231838 2012-02-16 21:57:50Z uqs $
 
 .PATH: ${.CURDIR}/../../net80211
 
@@ -13,8 +13,8 @@
 	ieee80211_ht.c ieee80211_hwmp.c ieee80211_adhoc.c ieee80211_hostap.c \
 	ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c \
 	ieee80211_tdma.c
-SRCS+=	bus_if.h device_if.h opt_inet.h opt_inet6.h opt_ipx.h opt_wlan.h \
-	opt_ddb.h
+SRCS+=	bus_if.h device_if.h opt_ddb.h opt_inet.h opt_inet6.h opt_ipx.h \
+	opt_tdma.h opt_wlan.h
 
 .if !defined(KERNBUILDDIR)
 opt_wlan.h:


More information about the Zrouter-src-freebsd mailing list