[Glibc-bsd-commits] r3974 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sun Jan 15 15:16:41 UTC 2012
Author: rmh
Date: 2012-01-15 15:16:41 +0000 (Sun, 15 Jan 2012)
New Revision: 3974
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/001_misc.diff
trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff
trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-10/debian/patches/904_dev_full.diff
trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-10/debian/patches/952_nodebug.diff
trunk/kfreebsd-10/debian/patches/999_config.diff
trunk/kfreebsd-10/debian/patches/999_firmware.diff
Log:
New upstream snapshot
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/changelog 2012-01-15 15:16:41 UTC (rev 3974)
@@ -1,11 +1,14 @@
-kfreebsd-10 (10.0~svn228940-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn230109-1) experimental; urgency=low
+ * New upstream snapshot.
+
+ [ Robert Millan ]
* Remove 951_disable_mk_magic.diff (except for MK_CTF bits), build-depend
on freebsd-buildutils >= 9 instead.
* 952_nodebug.diff: Disable full debugger support to minimize the
impact of heisenbugs (see patch header for details).
- -- Robert Millan <rmh at debian.org> Sun, 08 Jan 2012 15:56:24 +0100
+ -- Robert Millan <rmh at debian.org> Sun, 15 Jan 2012 14:35:58 +0100
kfreebsd-10 (10.0~svn228940-1) experimental; urgency=low
Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -22,7 +22,7 @@
-Wmissing-include-dirs -fdiagnostics-show-option \
${CWARNEXTRA}
#
-@@ -48,7 +57,7 @@
+@@ -50,7 +59,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
.if ${CC:T:Mclang} != "clang"
Modified: trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -1,54 +1,14 @@
-Obtained from kern/159663
+Fix for kern/159663, simpler version obtained from PC-BSD.
---- a/sys/fs/nullfs/null_vnops.c
-+++ b/sys/fs/nullfs/null_vnops.c
-@@ -365,16 +365,38 @@
- vrele(lvp);
- } else {
- error = null_nodeget(dvp->v_mount, lvp, &vp);
-- if (error)
-+ if (error) {
- vput(lvp);
-- else
-+ } else if (vp->v_type == VSOCK) {
-+ vref(lvp);
-+ vrele(vp);
-+ *ap->a_vpp = lvp;
-+ } else {
- *ap->a_vpp = vp;
-+ }
- }
- }
- return (error);
- }
-
- static int
-+null_create(struct vop_create_args *ap)
-+{
-+ struct vnode *vp, *lvp;
-+ int retval;
-+
-+ retval = null_bypass(&ap->a_gen);
-+ vp = *ap->a_vpp;
-+ if (retval == 0 && vp->v_type == VSOCK) {
-+ lvp = NULLVPTOLOWERVP(vp);
-+ vref(lvp);
-+ vrele(vp);
-+ *ap->a_vpp = lvp;
-+ }
-+ return (retval);
-+}
-+
-+static int
- null_open(struct vop_open_args *ap)
- {
- int retval;
-@@ -825,6 +847,7 @@
- .vop_accessx = null_accessx,
- .vop_advlockpurge = vop_stdadvlockpurge,
- .vop_bmap = VOP_EOPNOTSUPP,
-+ .vop_create = null_create,
- .vop_getattr = null_getattr,
- .vop_getwritemount = null_getwritemount,
- .vop_inactive = null_inactive,
+--- a/sys/fs/nullfs/null_subr.c
++++ b/sys/fs/nullfs/null_subr.c
+@@ -236,6 +236,8 @@
+ xp->null_vnode = vp;
+ xp->null_lowervp = lowervp;
+ vp->v_type = lowervp->v_type;
++ if (vp->v_type == VSOCK || vp->v_type == VFIFO)
++ vp->v_un = lowervp->v_un;
+ vp->v_data = xp;
+ vp->v_vnlock = lowervp->v_vnlock;
+ if (vp->v_vnlock == NULL)
Modified: trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/903_disable_non-free_drivers.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -1,6 +1,6 @@
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -144,8 +144,6 @@
+@@ -147,8 +147,6 @@
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -11,7 +11,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -108,10 +108,7 @@
+@@ -109,10 +109,7 @@
hatm \
hifn \
hme \
@@ -22,7 +22,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -230,7 +227,6 @@
+@@ -231,7 +228,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -32,7 +32,7 @@
${_nxge} \
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -138,8 +138,6 @@
+@@ -141,8 +141,6 @@
#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -98,8 +98,8 @@
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
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -46,31 +46,6 @@
@@ -134,13 +134,14 @@
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
-@@ -146,17 +121,9 @@
+@@ -146,18 +121,9 @@
dev/atkbdc/atkbdc_isa.c optional atkbdc isa
dev/atkbdc/atkbdc_subr.c optional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
-dev/ce/ceddk.c optional ce
-dev/ce/if_ce.c optional ce
--dev/ce/tau32-ddk.c optional ce
+-dev/ce/tau32-ddk.c optional ce \
+- compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
dev/cm/if_cm_isa.c optional cm isa
dev/coretemp/coretemp.c optional coretemp
-dev/cp/cpddk.c optional cp
@@ -152,7 +153,7 @@
dev/cx/csigma.c optional cx
dev/cx/cxddk.c optional cx
dev/cx/if_cx.c optional cx
-@@ -178,17 +145,6 @@
+@@ -179,17 +145,6 @@
dev/glxiic/glxiic.c optional glxiic
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
@@ -170,7 +171,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -221,7 +177,6 @@
+@@ -222,7 +177,6 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
Modified: trunk/kfreebsd-10/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/904_dev_full.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/904_dev_full.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -4,7 +4,7 @@
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
-@@ -45,9 +45,11 @@
+@@ -46,9 +46,11 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -14,9 +14,9 @@
static d_write_t null_write;
+static d_write_t full_write;
static d_ioctl_t null_ioctl;
+ static d_ioctl_t zero_ioctl;
static d_read_t zero_read;
-
-@@ -59,6 +61,14 @@
+@@ -61,6 +63,14 @@
.d_name = "null",
};
@@ -31,7 +31,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -78,11 +88,25 @@
+@@ -81,6 +91,15 @@
/* ARGSUSED */
static int
@@ -42,26 +42,16 @@
+ return (ENOSPC);
+}
+
-+#include <sys/filio.h>
+/* ARGSUSED */
+static int
null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
int flags __unused, struct thread *td)
{
- int error;
-
-+ if (cmd == FIONBIO)
-+ return 0;
-+ if ((cmd == FIOASYNC) && ((*(int *)data) == 0))
-+ return 0;
- if (cmd != DIOCSKERNELDUMP)
- return (ENOIOCTL);
- error = priv_check(td, PRIV_SETDUMPER);
-@@ -122,12 +146,15 @@
+@@ -158,12 +177,15 @@
printf("null: <null device, zero device>\n");
null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "null");
-+ null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &full_cdevsw, 0,
++ full_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &full_cdevsw, 0,
+ NULL, UID_ROOT, GID_WHEEL, 0666, "full");
zero_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &zero_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "zero");
Modified: trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -153,8 +153,6 @@
+@@ -154,8 +154,6 @@
jme \
joy \
kbdmux \
Modified: trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/950_no_stack_protector.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -8,7 +8,7 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -148,6 +148,8 @@
+@@ -150,6 +150,8 @@
#
# GCC SSP support
#
Modified: trunk/kfreebsd-10/debian/patches/952_nodebug.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/952_nodebug.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/952_nodebug.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -10,7 +10,7 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -73,16 +73,7 @@
+@@ -75,16 +75,7 @@
# Debugging support. Always need this:
options KDB # Enable kernel debugger support.
# For minimum debugger support (stable branch) use:
@@ -30,7 +30,7 @@
options SMP # Symmetric MultiProcessor Kernel
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -73,16 +73,7 @@
+@@ -75,16 +75,7 @@
# Debugging support. Always need this:
options KDB # Enable kernel debugger support.
# For minimum debugger support (stable branch) use:
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -25,7 +25,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -76,7 +78,7 @@
+@@ -78,7 +80,7 @@
options KDB_TRACE # Print a stack trace for a panic.
# Make an SMP-capable kernel by default
@@ -34,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -85,9 +87,6 @@
+@@ -87,9 +89,6 @@
device acpi
device pci
@@ -44,7 +44,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -114,7 +113,6 @@
+@@ -116,7 +115,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -52,7 +52,7 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -179,10 +177,6 @@
+@@ -182,10 +180,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -63,7 +63,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -193,8 +187,6 @@
+@@ -196,8 +190,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgbe # Intel PRO/10GbE PCIE Ethernet Family
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -72,7 +72,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -204,12 +196,10 @@
+@@ -207,12 +199,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -85,7 +85,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -219,7 +209,6 @@
+@@ -222,7 +212,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -93,7 +93,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -239,7 +228,6 @@
+@@ -242,7 +231,6 @@
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
@@ -101,7 +101,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -259,12 +247,7 @@
+@@ -262,12 +250,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -114,7 +114,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device wpi # Intel 3945ABG wireless NICs.
-@@ -273,11 +256,8 @@
+@@ -276,11 +259,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -126,7 +126,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -292,39 +272,9 @@
+@@ -295,39 +275,9 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
@@ -166,7 +166,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -335,15 +285,15 @@
+@@ -338,15 +288,15 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -230,7 +230,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -76,7 +80,7 @@
+@@ -78,7 +82,7 @@
options KDB_TRACE # Print a stack trace for a panic.
# To make an SMP kernel, the next two lines are needed
@@ -239,7 +239,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -87,9 +91,6 @@
+@@ -89,9 +93,6 @@
device eisa
device pci
@@ -249,7 +249,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -116,7 +117,6 @@
+@@ -118,7 +119,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -257,7 +257,7 @@
device aha # Adaptec 154x SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -189,10 +189,6 @@
+@@ -192,10 +192,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -268,7 +268,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -203,8 +199,6 @@
+@@ -206,8 +202,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -277,7 +277,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -214,12 +208,10 @@
+@@ -217,12 +211,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -290,7 +290,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -229,7 +221,6 @@
+@@ -232,7 +224,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -298,7 +298,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -251,7 +242,6 @@
+@@ -254,7 +245,6 @@
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -306,7 +306,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -271,12 +261,7 @@
+@@ -274,12 +264,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -319,7 +319,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
device wpi # Intel 3945ABG wireless NICs.
-@@ -286,11 +271,8 @@
+@@ -289,11 +274,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -331,7 +331,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -305,39 +287,9 @@
+@@ -308,39 +290,9 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
@@ -371,7 +371,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -348,15 +300,15 @@
+@@ -351,15 +303,15 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-10/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_firmware.diff 2012-01-14 20:52:22 UTC (rev 3973)
+++ trunk/kfreebsd-10/debian/patches/999_firmware.diff 2012-01-15 15:16:41 UTC (rev 3974)
@@ -3,7 +3,7 @@
--- a/sys/conf/files
+++ b/sys/conf/files
-@@ -491,10 +491,6 @@
+@@ -490,10 +490,6 @@
dev/advansys/advansys.c optional adv
dev/advansys/advlib.c optional adv
dev/advansys/advmcode.c optional adv
@@ -14,7 +14,7 @@
dev/ae/if_ae.c optional ae pci
dev/age/if_age.c optional age pci
dev/agp/agp.c optional agp pci
-@@ -860,7 +856,6 @@
+@@ -859,7 +855,6 @@
dev/ath/ath_dfs/null/dfs_null.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
#
@@ -22,7 +22,7 @@
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
dev/bktr/bktr_audio.c optional bktr pci
-@@ -898,34 +893,6 @@
+@@ -897,34 +892,6 @@
dev/cs/if_cs.c optional cs
dev/cs/if_cs_isa.c optional cs isa
dev/cs/if_cs_pccard.c optional cs pccard
@@ -57,7 +57,7 @@
dev/cxgbe/t4_main.c optional cxgbe pci \
compile-with "${NORMAL_C} -I$S/dev/cxgbe"
dev/cxgbe/t4_sge.c optional cxgbe pci \
-@@ -944,13 +911,6 @@
+@@ -943,13 +910,6 @@
dev/dcons/dcons_crom.c optional dcons_crom
dev/dcons/dcons_os.c optional dcons
dev/de/if_de.c optional de pci
@@ -71,7 +71,7 @@
dev/digi/digi.c optional digi
dev/digi/digi_isa.c optional digi isa
dev/digi/digi_pci.c optional digi pci
-@@ -986,26 +946,6 @@
+@@ -985,29 +945,6 @@
dev/drm/mach64_drv.c optional mach64drm
dev/drm/mach64_irq.c optional mach64drm
dev/drm/mach64_state.c optional mach64drm
@@ -81,15 +81,18 @@
-dev/drm/mga_state.c optional mgadrm \
- compile-with "${NORMAL_C} -finline-limit=13500"
-dev/drm/mga_warp.c optional mgadrm
--dev/drm/r128_cce.c optional r128drm
+-dev/drm/r128_cce.c optional r128drm \
+- compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
-dev/drm/r128_drv.c optional r128drm
-dev/drm/r128_irq.c optional r128drm
-dev/drm/r128_state.c optional r128drm \
-- compile-with "${NORMAL_C} -finline-limit=13500"
+- compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} -finline-limit=13500"
-dev/drm/r300_cmdbuf.c optional radeondrm
-dev/drm/r600_blit.c optional radeondrm
--dev/drm/r600_cp.c optional radeondrm
--dev/drm/radeon_cp.c optional radeondrm
+-dev/drm/r600_cp.c optional radeondrm \
+- compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
+-dev/drm/radeon_cp.c optional radeondrm \
+- compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}"
-dev/drm/radeon_cs.c optional radeondrm
-dev/drm/radeon_drv.c optional radeondrm
-dev/drm/radeon_irq.c optional radeondrm
@@ -98,7 +101,7 @@
dev/drm/savage_bci.c optional savagedrm
dev/drm/savage_drv.c optional savagedrm
dev/drm/savage_state.c optional savagedrm
-@@ -1102,8 +1042,6 @@
+@@ -1104,8 +1041,6 @@
dev/firewire/sbp_targ.c optional sbp_targ
dev/flash/at45d.c optional at45d
dev/flash/mx25l.c optional mx25l
@@ -107,7 +110,7 @@
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
dev/gem/if_gem_sbus.c optional gem sbus
-@@ -1160,49 +1098,6 @@
+@@ -1162,49 +1097,6 @@
dev/ips/ips_disk.c optional ips
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
@@ -157,7 +160,7 @@
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
-@@ -1215,163 +1110,6 @@
+@@ -1217,163 +1109,6 @@
dev/isp/isp_pci.c optional isp pci
dev/isp/isp_sbus.c optional isp sbus
dev/isp/isp_target.c optional isp
@@ -321,7 +324,7 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
-@@ -1481,33 +1219,6 @@
+@@ -1483,33 +1218,6 @@
dev/mvs/mvs.c optional mvs
dev/mvs/mvs_if.m optional mvs
dev/mvs/mvs_pci.c optional mvs pci
@@ -355,7 +358,7 @@
dev/mxge/if_mxge.c optional mxge pci
dev/mxge/mxge_lro.c optional mxge pci
dev/mxge/mxge_eth_z8e.c optional mxge pci
-@@ -1598,65 +1309,6 @@
+@@ -1608,65 +1316,6 @@
dev/puc/puc_pci.c optional puc pci
dev/puc/pucdata.c optional puc pci
dev/quicc/quicc_core.c optional quicc
@@ -421,7 +424,7 @@
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
-@@ -1681,14 +1333,7 @@
+@@ -1691,14 +1340,7 @@
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/sdhci/sdhci.c optional sdhci pci
@@ -436,7 +439,7 @@
dev/siba/siba_bwn.c optional siba_bwn pci
dev/siba/siba_core.c optional siba_bwn pci
dev/siis/siis.c optional siis pci
-@@ -1699,9 +1344,6 @@
+@@ -1709,9 +1351,6 @@
dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
@@ -446,7 +449,7 @@
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
-@@ -1717,10 +1359,6 @@
+@@ -1727,10 +1366,6 @@
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
@@ -454,10 +457,10 @@
- warning "kernel contains GPL contaminated csaimg.h header"
-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 \
- dependency "emu10k1-alsa%diked.h" \
- warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1743,8 +1381,6 @@
+ dev/sound/pci/emu10k1.c optional snd_emu10k1 pci
+ dev/sound/pci/emu10kx.c optional snd_emu10kx pci
+ dev/sound/pci/emu10kx-pcm.c optional snd_emu10kx pci
+@@ -1741,8 +1376,6 @@
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
@@ -466,7 +469,7 @@
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
-@@ -1824,7 +1460,6 @@
+@@ -1822,7 +1455,6 @@
dev/syscons/warp/warp_saver.c optional warp_saver
dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux
dev/tdfx/tdfx_pci.c optional tdfx pci
@@ -474,7 +477,7 @@
dev/tl/if_tl.c optional tl pci
dev/trm/trm.c optional trm
dev/twa/tw_cl_init.c optional twa \
-@@ -1847,7 +1482,6 @@
+@@ -1845,7 +1477,6 @@
dev/tws/tws_services.c optional tws
dev/tws/tws_user.c optional tws
dev/tx/if_tx.c optional tx
@@ -482,7 +485,7 @@
dev/uart/uart_bus_acpi.c optional uart acpi
#dev/uart/uart_bus_cbus.c optional uart cbus
dev/uart/uart_bus_ebus.c optional uart ebus
-@@ -1927,19 +1561,17 @@
+@@ -1925,19 +1556,17 @@
dev/usb/net/if_cdce.c optional cdce
dev/usb/net/if_cue.c optional cue
dev/usb/net/if_ipheth.c optional ipheth
@@ -503,7 +506,7 @@
dev/usb/wlan/if_run.c optional run
runfw.c optional runfw \
compile-with "${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}" \
-@@ -1955,11 +1587,9 @@
+@@ -1953,11 +1582,9 @@
compile-with "uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu" \
no-obj no-implicit-rule \
clean "runfw"
@@ -537,15 +540,7 @@
bfe \
bge \
${_bxe} \
-@@ -56,7 +55,6 @@
- cc \
- cd9660 \
- cd9660_iconv \
-- ${_ce} \
- ${_ciss} \
- ${_cm} \
- ${_cmx} \
-@@ -64,14 +62,11 @@
+@@ -65,14 +64,11 @@
coda5 \
${_coff} \
${_coretemp} \
@@ -560,7 +555,7 @@
cxgbe \
${_cyclic} \
dc \
-@@ -94,13 +89,11 @@
+@@ -95,13 +91,11 @@
${_ex} \
${_exca} \
${_ext2fs} \
@@ -574,7 +569,7 @@
gem \
geom \
${_glxiic} \
-@@ -140,14 +133,10 @@
+@@ -141,14 +135,10 @@
ip_mroute_mod \
${_ips} \
${_ipw} \
@@ -589,7 +584,7 @@
${_ixgb} \
${_ixgbe} \
jme \
-@@ -202,7 +191,6 @@
+@@ -203,7 +193,6 @@
${_mthca} \
mvs \
mwl \
@@ -597,7 +592,7 @@
mxge \
my \
${_ncp} \
-@@ -251,14 +239,12 @@
+@@ -252,14 +241,12 @@
puc \
${_qlxgb} \
ral \
@@ -612,7 +607,7 @@
${_s3} \
${_safe} \
${_sbni} \
-@@ -268,7 +254,6 @@
+@@ -269,7 +256,6 @@
sdhci \
sem \
send \
@@ -620,7 +615,7 @@
${_sfxge} \
sge \
siba_bwn \
-@@ -277,7 +262,6 @@
+@@ -278,7 +264,6 @@
sis \
sk \
${_smbfs} \
@@ -628,7 +623,7 @@
${_snc} \
snp \
${_sound} \
-@@ -292,7 +276,6 @@
+@@ -293,7 +278,6 @@
${_sym} \
${_syscons} \
sysvipc \
@@ -636,7 +631,7 @@
tl \
tmpfs \
${_tpm} \
-@@ -301,7 +284,6 @@
+@@ -302,7 +286,6 @@
twe \
tws \
tx \
@@ -644,7 +639,7 @@
uart \
ubsec \
udf \
-@@ -331,7 +313,6 @@
+@@ -332,7 +315,6 @@
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -652,7 +647,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -408,9 +389,7 @@
+@@ -409,9 +391,7 @@
_bxe= bxe
_cardbus= cardbus
_cbb= cbb
@@ -662,7 +657,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -512,11 +491,8 @@
+@@ -513,11 +493,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -674,7 +669,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -527,7 +503,6 @@
+@@ -528,7 +505,6 @@
_tpm= tpm
_viawd= viawd
_wpi= wpi
@@ -682,7 +677,7 @@
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -592,11 +567,8 @@
+@@ -593,11 +569,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -694,7 +689,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -642,7 +614,6 @@
+@@ -643,7 +616,6 @@
_x86bios= x86bios
_wi= wi
_wpi= wpi
More information about the Glibc-bsd-commits
mailing list