CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: mlelstv
Date: Mon Dec 15 08:17:15 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_emmc.c
Log Message:
Don't pipeline any DMA writes to eMMC.
Fixes PR/49463.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/broadcom/bcm2835_emmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.20 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.21
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.20 Tue Nov 25 14:30:05 2014
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Mon Dec 15 08:17:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.20 2014/11/25 14:30:05 skrll Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.21 2014/12/15 08:17:15 mlelstv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.20 2014/11/25 14:30:05 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.21 2014/12/15 08:17:15 mlelstv Exp $);
#include bcmdmac.h
@@ -278,6 +278,7 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
if ((sc-sc_cblk[seg].cb_txfr_len 0xf) == 0)
sc-sc_cblk[seg].cb_ti |= DMAC_TI_SRC_WIDTH;
sc-sc_cblk[seg].cb_ti |= DMAC_TI_DEST_DREQ;
+ sc-sc_cblk[seg].cb_ti |= DMAC_TI_WAIT_RESP;
sc-sc_cblk[seg].cb_source_ad =
cmd-c_dmamap-dm_segs[seg].ds_addr;
sc-sc_cblk[seg].cb_dest_ad =
@@ -286,7 +287,6 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
}
sc-sc_cblk[seg].cb_stride = 0;
if (seg == cmd-c_dmamap-dm_nsegs - 1) {
- sc-sc_cblk[seg].cb_ti |= DMAC_TI_WAIT_RESP;
sc-sc_cblk[seg].cb_ti |= DMAC_TI_INTEN;
sc-sc_cblk[seg].cb_nextconbk = 0;
} else {
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Mon Dec 15 10:10:24 UTC 2014
Modified Files:
src/usr.bin/config: mkmakefile.c
Log Message:
config(1): Fix build of old tree (bin/49389)
Define the default, empty build_kernel target, so that old source trees,
whose sys/conf/Makefile.kern.inc don't have build_kernel .USE target, can
be built.
(When build_kernel is defined, the target is overriden, as far as
sys/conf/Makefile.kern.inc is included later than the netbsd: ... definition
in sys/arch/*/conf/Makefile.*.)
This should address PR bin/49389.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/config/mkmakefile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.34 src/usr.bin/config/mkmakefile.c:1.35
--- src/usr.bin/config/mkmakefile.c:1.34 Fri Nov 21 20:46:56 2014
+++ src/usr.bin/config/mkmakefile.c Mon Dec 15 10:10:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.34 2014/11/21 20:46:56 christos Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.35 2014/12/15 10:10:24 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkmakefile.c,v 1.34 2014/11/21 20:46:56 christos Exp $);
+__RCSID($NetBSD: mkmakefile.c,v 1.35 2014/12/15 10:10:24 uebayasi Exp $);
#include sys/param.h
#include ctype.h
@@ -581,6 +581,7 @@ emitload(FILE *fp)
fputs(\n\n, fp);
TAILQ_FOREACH(cf, allcf, cf_next) {
fprintf(fp, KERNELS+=%s\n, cf-cf_name);
+ fprintf(fp, build_kernel:\n);
fprintf(fp, %s: ${SYSTEM_DEP} swap%s.o vers.o build_kernel\n,
cf-cf_name, cf-cf_name);
fprintf(fp, swap%s.o: swap%s.c\n
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: skrll
Date: Mon Dec 15 11:02:33 UTC 2014
Modified Files:
src/sys/dev/ic: oosiop.c
Log Message:
Load the right xfer address into cb[i].xferdma. Fixes disk detection on
my hp715/50.
Hi Taylor.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/oosiop.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/oosiop.c
diff -u src/sys/dev/ic/oosiop.c:1.14 src/sys/dev/ic/oosiop.c:1.15
--- src/sys/dev/ic/oosiop.c:1.14 Mon Aug 18 03:43:10 2014
+++ src/sys/dev/ic/oosiop.c Mon Dec 15 11:02:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop.c,v 1.14 2014/08/18 03:43:10 riastradh Exp $ */
+/* $NetBSD: oosiop.c,v 1.15 2014/12/15 11:02:33 skrll Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oosiop.c,v 1.14 2014/08/18 03:43:10 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: oosiop.c,v 1.15 2014/12/15 11:02:33 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -306,7 +306,7 @@ oosiop_alloc_cb(struct oosiop_softc *sc,
err);
goto loop_fail2;
}
- err = bus_dmamap_load(sc-sc_dmat, cb[i].xferdma, xfer,
+ err = bus_dmamap_load(sc-sc_dmat, cb[i].xferdma, xfer[i],
sizeof(struct oosiop_xfer), NULL, BUS_DMA_NOWAIT);
if (err) {
printf(: failed to load xfer block, err=%d\n, err);
CVS commit: [netbsd-7] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Mon Dec 15 11:51:51 UTC 2014
Modified Files:
src/sys/dev/ic [netbsd-7]: oosiop.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #327):
sys/dev/ic/oosiop.c: revision 1.15
Load the right xfer address into cb[i].xferdma. Fixes disk detection on
my hp715/50.
Hi Taylor.
To generate a diff of this commit:
cvs rdiff -u -r1.13.34.1 -r1.13.34.2 src/sys/dev/ic/oosiop.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/oosiop.c
diff -u src/sys/dev/ic/oosiop.c:1.13.34.1 src/sys/dev/ic/oosiop.c:1.13.34.2
--- src/sys/dev/ic/oosiop.c:1.13.34.1 Fri Aug 22 10:15:22 2014
+++ src/sys/dev/ic/oosiop.c Mon Dec 15 11:51:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop.c,v 1.13.34.1 2014/08/22 10:15:22 martin Exp $ */
+/* $NetBSD: oosiop.c,v 1.13.34.2 2014/12/15 11:51:51 martin Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oosiop.c,v 1.13.34.1 2014/08/22 10:15:22 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: oosiop.c,v 1.13.34.2 2014/12/15 11:51:51 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -306,7 +306,7 @@ oosiop_alloc_cb(struct oosiop_softc *sc,
err);
goto loop_fail2;
}
- err = bus_dmamap_load(sc-sc_dmat, cb[i].xferdma, xfer,
+ err = bus_dmamap_load(sc-sc_dmat, cb[i].xferdma, xfer[i],
sizeof(struct oosiop_xfer), NULL, BUS_DMA_NOWAIT);
if (err) {
printf(: failed to load xfer block, err=%d\n, err);
CVS commit: [netbsd-7] src/sys/arch/arm/broadcom
Module Name:src
Committed By: martin
Date: Mon Dec 15 11:53:58 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom [netbsd-7]: bcm2835_emmc.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #328):
sys/arch/arm/broadcom/bcm2835_emmc.c: revision 1.21
Don't pipeline any DMA writes to eMMC.
Fixes PR/49463.
To generate a diff of this commit:
cvs rdiff -u -r1.9.4.3 -r1.9.4.4 src/sys/arch/arm/broadcom/bcm2835_emmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.3 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.4
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.9.4.3 Tue Nov 25 15:49:27 2014
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Mon Dec 15 11:53:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.9.4.3 2014/11/25 15:49:27 martin Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.9.4.4 2014/12/15 11:53:58 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.9.4.3 2014/11/25 15:49:27 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.9.4.4 2014/12/15 11:53:58 martin Exp $);
#include bcmdmac.h
@@ -278,6 +278,7 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
if ((sc-sc_cblk[seg].cb_txfr_len 0xf) == 0)
sc-sc_cblk[seg].cb_ti |= DMAC_TI_SRC_WIDTH;
sc-sc_cblk[seg].cb_ti |= DMAC_TI_DEST_DREQ;
+ sc-sc_cblk[seg].cb_ti |= DMAC_TI_WAIT_RESP;
sc-sc_cblk[seg].cb_source_ad =
cmd-c_dmamap-dm_segs[seg].ds_addr;
sc-sc_cblk[seg].cb_dest_ad =
@@ -286,7 +287,6 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
}
sc-sc_cblk[seg].cb_stride = 0;
if (seg == cmd-c_dmamap-dm_nsegs - 1) {
- sc-sc_cblk[seg].cb_ti |= DMAC_TI_WAIT_RESP;
sc-sc_cblk[seg].cb_ti |= DMAC_TI_INTEN;
sc-sc_cblk[seg].cb_nextconbk = 0;
} else {
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Dec 15 11:57:50 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #327 and #328 To generate a diff of this commit: cvs rdiff -u -r1.1.2.131 -r1.1.2.132 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.131 src/doc/CHANGES-7.0:1.1.2.132 --- src/doc/CHANGES-7.0:1.1.2.131 Sun Dec 14 17:04:18 2014 +++ src/doc/CHANGES-7.0 Mon Dec 15 11:57:50 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.131 2014/12/14 17:04:18 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.132 2014/12/15 11:57:50 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -3574,3 +3574,16 @@ usr.sbin/cpuctl/arch/i386.c 1.60-1.64 failed. [msaitoh, ticket #326] +sys/dev/ic/oosiop.c1.15 + + Load the right xfer address into cb[i].xferdma. Fixes disk detection + on hp715/50. + [skrll, ticket #327] + +sys/arch/arm/broadcom/bcm2835_emmc.c 1.21 + + Don't pipeline any DMA writes to eMMC. + Fixes PR/49463. + [mlelstv, ticket #328] + +
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Dec 15 12:48:42 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Change Intel 0x0434 entry: - Rename DH89XX_QA to DH89XXCC_IQIA - Modify the description to DH89xxCC PCIe Endpoint and QuickAssist (include typo fix) To generate a diff of this commit: cvs rdiff -u -r1.1205 -r1.1206 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1205 src/sys/dev/pci/pcidevs:1.1206 --- src/sys/dev/pci/pcidevs:1.1205 Thu Oct 30 10:50:44 2014 +++ src/sys/dev/pci/pcidevs Mon Dec 15 12:48:42 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1205 2014/10/30 10:50:44 nonaka Exp $ +$NetBSD: pcidevs,v 1.1206 2014/12/15 12:48:42 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2584,7 +2584,7 @@ product INTEL SRCU42E 0x0408 SCSI RAID product INTEL SRCS28X 0x0409 SATA RAID Controller product INTEL HASWELL_IGD 0x0402 Haswell Integrated Graphics Device product INTEL HASWELL_IGD_1 0x0412 Haswell Integrated Graphics Device -product INTEL DH89XX_QA 0x0434 DH89xx QuiskAssit +product INTEL DH89XXCC_IQIA 0x0434 DH89xxCC PCIe Endpoint and QuickAssist product INTEL DH89XXCC_SGMII 0x0438 DH89XXCC SGMII product INTEL DH89XXCC_SERDES 0x043a DH89XXCC SerDes product INTEL DH89XXCC_BPLANE 0x043c DH89XXCC backplane
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Dec 15 13:13:17 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: - Rename DH89xxCC's names from DH89XX_ to DH89XXCC_. - Add some DH89xxCC's devices. - Add DH89XXCL's devices. To generate a diff of this commit: cvs rdiff -u -r1.1206 -r1.1207 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1206 src/sys/dev/pci/pcidevs:1.1207 --- src/sys/dev/pci/pcidevs:1.1206 Mon Dec 15 12:48:42 2014 +++ src/sys/dev/pci/pcidevs Mon Dec 15 13:13:17 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1206 2014/12/15 12:48:42 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1207 2014/12/15 13:13:17 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2585,6 +2585,7 @@ product INTEL SRCS28X 0x0409 SATA RAID product INTEL HASWELL_IGD 0x0402 Haswell Integrated Graphics Device product INTEL HASWELL_IGD_1 0x0412 Haswell Integrated Graphics Device product INTEL DH89XXCC_IQIA 0x0434 DH89xxCC PCIe Endpoint and QuickAssist +product INTEL DH89XXCL_IQIA 0x0435 DH89xxCL PCIe Endpoint and QuickAssist product INTEL DH89XXCC_SGMII 0x0438 DH89XXCC SGMII product INTEL DH89XXCC_SERDES 0x043a DH89XXCC SerDes product INTEL DH89XXCC_BPLANE 0x043c DH89XXCC backplane @@ -3094,19 +3095,42 @@ product INTEL C2000_1000KX 0x1f40 C2000 product INTEL C2000_SGMII 0x1f41 C2000 Ethernet(SGMII) product INTEL C2000_DUMMYGBE 0x1f42 C2000 Ethernet(Dummy function) product INTEL C2000_25GBE 0x1f45 C2000 Ethernet(2.5Gbe) -product INTEL DH89XX_LPC 0x2310 DH89xx LPC Controller -product INTEL DH89XX_SATA_1 0x2323 DH89xx SATA Controller -product INTEL DH89XX_SATA_2 0x2326 DH89xx SATA Controller -product INTEL DH89XX_SMB 0x2330 DH89xx SMBus Host Controller -product INTEL DH89XX_THERMAL 0x2332 DH89xx Thermal Subsystem -product INTEL DH89XX_USB 0x2334 DH89xx USB EHCI -product INTEL DH89XX_PCIE_1 0x2342 DH89xx PCIe Root Port -product INTEL DH89XX_PCIE_2 0x2344 DH89xx PCIe Root Port -product INTEL DH89XX_PCIE_3 0x2346 DH89xx PCIe Root Port -product INTEL DH89XX_PCIE_4 0x2348 DH89xx PCIe Root Port -product INTEL DH89XX_WDT 0x2360 DH89xx Watchdog Timer for Core Reset -product INTEL DH89XX_MEI_1 0x2364 DH89xx MEI Controller -product INTEL DH89XX_MEI_2 0x2365 DH89xx MEI Controller +product INTEL DH89XXCC_LPC 0x2310 DH89xxCC LPC Controller +product INTEL DH89XXCC_SATA_1 0x2323 DH89xxCC SATA Controller +product INTEL DH89XXCC_SATA_2 0x2326 DH89xxCC SATA Controller +product INTEL DH89XXCC_SMB 0x2330 DH89xxCC SMBus Host Controller +product INTEL DH89XXCC_THERMAL 0x2332 DH89xxCC Thermal Subsystem +product INTEL DH89XXCC_USB_1 0x2334 DH89xxCC USB EHCI +product INTEL DH89XXCC_USB_2 0x2335 DH89xxCC USB EHCI +product INTEL DH89XXCC_PCIE_1_1 0x2342 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_1_2 0x2343 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_2_1 0x2344 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_2_2 0x2345 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_3_1 0x2346 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_3_2 0x2347 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_4_1 0x2348 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_4_2 0x2349 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_WDT 0x2360 DH89xxCC Watchdog Timer for Core Reset +product INTEL DH89XXCC_MEI_1 0x2364 DH89xxCC MEI Controller +product INTEL DH89XXCC_MEI_2 0x2365 DH89xxCC MEI Controller +product INTEL DH89XXCL_LPC 0x2390 DH89xxCL LPC Controller +product INTEL DH89XXCL_SATA_1 0x23a3 DH89xxCL SATA Controller +product INTEL DH89XXCL_SATA_2 0x23a6 DH89xxCL SATA Controller +product INTEL DH89XXCL_SMB 0x23b0 DH89xxCL SMBus Host Controller +product INTEL DH89XXCL_THERMAL 0x23b2 DH89xxCL Thermal Subsystem +product INTEL DH89XXCL_USB_1 0x23b4 DH89xxCL USB EHCI +product INTEL DH89XXCL_USB_2 0x23b4 DH89xxCL USB EHCI +product INTEL DH89XXCL_PCIE_1_1 0x23c2 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_1_2 0x23c3 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_2_1 0x23c4 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_2_2 0x23c5 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_3_1 0x23c6 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_3_2 0x23c7 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_4_1 0x23c8 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_4_2 0x23c9 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_WDT 0x23e0 DH89xxCL Watchdog Timer for Core Reset +product INTEL DH89XXCL_MEI_1 0x23e4 DH89xxCL MEI Controller +product INTEL DH89XXCL_MEI_2 0x23e5 DH89xxCL MEI Controller product INTEL 82801AA_LPC 0x2410 82801AA LPC Interface Bridge product INTEL 82801AA_IDE 0x2411 82801AA IDE Controller product INTEL 82801AA_USB 0x2412 82801AA USB Controller
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Dec 15 13:16:42 UTC 2014 Modified Files: src/sys/dev/pci: ichsmb.c Log Message: - Rename PCI_PRODUCT_INTEL_DH89XX_SMB to PCI_PRODUCT_INTEL_DH89XXCC_SMB - Add PCI_PRODUCT_INTEL_DH89XXCL_SMB To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ichsmb.c diff -u src/sys/dev/pci/ichsmb.c:1.37 src/sys/dev/pci/ichsmb.c:1.38 --- src/sys/dev/pci/ichsmb.c:1.37 Wed Jul 2 19:49:38 2014 +++ src/sys/dev/pci/ichsmb.c Mon Dec 15 13:16:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.37 2014/07/02 19:49:38 riastradh Exp $ */ +/* $NetBSD: ichsmb.c,v 1.38 2014/12/15 13:16:42 msaitoh Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.37 2014/07/02 19:49:38 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.38 2014/12/15 13:16:42 msaitoh Exp $); #include sys/param.h #include sys/device.h @@ -117,7 +117,8 @@ ichsmb_match(device_t parent, cfdata_t m case PCI_PRODUCT_INTEL_C600_SMB_1: case PCI_PRODUCT_INTEL_C600_SMB_2: case PCI_PRODUCT_INTEL_EP80579_SMB: - case PCI_PRODUCT_INTEL_DH89XX_SMB: + case PCI_PRODUCT_INTEL_DH89XXCC_SMB: + case PCI_PRODUCT_INTEL_DH89XXCL_SMB: case PCI_PRODUCT_INTEL_C2000_PCU_SMBUS: return 1; }
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: msaitoh
Date: Mon Dec 15 13:29:43 UTC 2014
Modified Files:
src/sys/arch/x86/pci: ichlpcib.c
Log Message:
Add DH89xxC[CL] LPC devices.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/pci/ichlpcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.43 src/sys/arch/x86/pci/ichlpcib.c:1.44
--- src/sys/arch/x86/pci/ichlpcib.c:1.43 Sat Jan 4 02:59:17 2014
+++ src/sys/arch/x86/pci/ichlpcib.c Mon Dec 15 13:29:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.43 2014/01/04 02:59:17 msaitoh Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.44 2014/12/15 13:29:42 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.43 2014/01/04 02:59:17 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.44 2014/12/15 13:29:42 msaitoh Exp $);
#include sys/types.h
#include sys/param.h
@@ -262,6 +262,8 @@ static struct lpcib_device {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C226_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H81_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DH89XXCC_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DH89XXCL_LPC, 1, 0 },
#if 0
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_PCU_1, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_PCU_2, 1, 0 },
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: skrll Date: Mon Dec 15 13:43:24 UTC 2014 Modified Files: src/external/gpl3/gdb/dist/gdb: configure.tgt Log Message: Allow i386 binary debugging on amd64 hosts. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/configure.tgt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/dist/gdb/configure.tgt diff -u src/external/gpl3/gdb/dist/gdb/configure.tgt:1.7 src/external/gpl3/gdb/dist/gdb/configure.tgt:1.8 --- src/external/gpl3/gdb/dist/gdb/configure.tgt:1.7 Sun Aug 10 05:57:30 2014 +++ src/external/gpl3/gdb/dist/gdb/configure.tgt Mon Dec 15 13:43:24 2014 @@ -686,8 +686,9 @@ x86_64-*-mingw* | x86_64-*-cygwin*) ;; x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu) # Target: NetBSD/amd64 - gdb_target_obs=amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o \ - nbsd-tdep.o solib-svr4.o + gdb_target_obs=amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o \ + i386bsd-tdep.o i386nbsd-tdep.o \ + i387-tdep.o nbsd-tdep.o solib-svr4.o ;; x86_64-*-openbsd*) # Target: OpenBSD/amd64
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: christos Date: Mon Dec 15 13:48:51 UTC 2014 Modified Files: src/sys/arch/xen/conf: files.xen Log Message: there is no ibcs2 in amd64 [yet?] To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/arch/xen/conf/files.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/conf/files.xen diff -u src/sys/arch/xen/conf/files.xen:1.135 src/sys/arch/xen/conf/files.xen:1.136 --- src/sys/arch/xen/conf/files.xen:1.135 Mon Dec 15 02:35:09 2014 +++ src/sys/arch/xen/conf/files.xen Mon Dec 15 08:48:51 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.xen,v 1.135 2014/12/15 07:35:09 ozaki-r Exp $ +# $NetBSD: files.xen,v 1.136 2014/12/15 13:48:51 christos Exp $ # NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp # NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp @@ -337,9 +337,10 @@ file arch/i386/i386/freebsd_sigcode.S co file arch/i386/i386/freebsd_syscall.c compat_freebsd elifdef amd64 + # Binary compatibility with previous NetBSD releases (COMPAT_XX) file arch/amd64/amd64/compat_13_machdep.c compat_13 -file arch/amd64/amd64/compat_16_machdep.c compat_16 | compat_ibcs2 +file arch/amd64/amd64/compat_16_machdep.c compat_16 # NetBSD/i386 32-bit binary compatibility (COMPAT_NETBSD32) include compat/netbsd32/files.netbsd32
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Mon Dec 15 13:50:10 UTC 2014 Modified Files: src/sys/kern: kern_ksyms.c Log Message: Don't hard code crap we have perfectly good constants for. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/kern/kern_ksyms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_ksyms.c diff -u src/sys/kern/kern_ksyms.c:1.74 src/sys/kern/kern_ksyms.c:1.75 --- src/sys/kern/kern_ksyms.c:1.74 Mon Dec 8 21:30:09 2014 +++ src/sys/kern/kern_ksyms.c Mon Dec 15 08:50:10 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_ksyms.c,v 1.74 2014/12/09 02:30:09 christos Exp $ */ +/* $NetBSD: kern_ksyms.c,v 1.75 2014/12/15 13:50:10 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.74 2014/12/09 02:30:09 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.75 2014/12/15 13:50:10 christos Exp $); #if defined(_KERNEL) defined(_KERNEL_OPT) #include opt_ddb.h @@ -878,7 +878,7 @@ ksyms_hdr_init(void *hdraddr) uint32_t offs = 1; /* First section header .note.netbsd.ident */ - ksyms_hdr.kh_shdr[SHNOTE].sh_name = offs; /* Section 6 offset */ + ksyms_hdr.kh_shdr[SHNOTE].sh_name = offs; ksyms_hdr.kh_shdr[SHNOTE].sh_type = SHT_NOTE; ksyms_hdr.kh_shdr[SHNOTE].sh_offset = offsetof(struct ksyms_hdr, kh_note[0]); @@ -892,7 +892,7 @@ ksyms_hdr_init(void *hdraddr) ksyms_hdr.kh_shdr[SYMTAB].sh_type = SHT_SYMTAB; ksyms_hdr.kh_shdr[SYMTAB].sh_offset = sizeof(struct ksyms_hdr); /* ksyms_hdr.kh_shdr[SYMTAB].sh_size = filled in at open */ - ksyms_hdr.kh_shdr[SYMTAB].sh_link = 2; /* Corresponding strtab */ + ksyms_hdr.kh_shdr[SYMTAB].sh_link = STRTAB; /* Corresponding strtab */ ksyms_hdr.kh_shdr[SYMTAB].sh_addralign = sizeof(long); ksyms_hdr.kh_shdr[SYMTAB].sh_entsize = sizeof(Elf_Sym); SHTCOPY(.symtab);
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Mon Dec 15 15:41:18 UTC 2014
Modified Files:
src/usr.bin/config: mkmakefile.c
Log Message:
config(1): Fix build of old trees (bin/49389) (take 2)
Look into sys/conf/Makefile.kern.inc to check if build_kernel .USE target
is defined. If not (== old source trees), generate one on the fly.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/config/mkmakefile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.35 src/usr.bin/config/mkmakefile.c:1.36
--- src/usr.bin/config/mkmakefile.c:1.35 Mon Dec 15 10:10:24 2014
+++ src/usr.bin/config/mkmakefile.c Mon Dec 15 15:41:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.35 2014/12/15 10:10:24 uebayasi Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.36 2014/12/15 15:41:18 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkmakefile.c,v 1.35 2014/12/15 10:10:24 uebayasi Exp $);
+__RCSID($NetBSD: mkmakefile.c,v 1.36 2014/12/15 15:41:18 uebayasi Exp $);
#include sys/param.h
#include ctype.h
@@ -86,6 +86,8 @@ static void emitappmkoptions(FILE *);
static void emitsubs(FILE *, const char *, const char *, int);
static int selectopt(const char *, void *);
+int has_build_kernel;
+
int
mkmakefile(void)
{
@@ -95,7 +97,32 @@ mkmakefile(void)
char *ifname;
char line[BUFSIZ], buf[200];
- /* Try a makefile for the port first.
+ /*
+ * Check if conf/Makefile.kern.inc defines build_kernel.
+ *
+ * (This is usually done by checking version in sys/conf/files;
+ * unfortunately the build_kernel change done around 2014 Aug didn't
+ * bump that version. Thus this hack.)
+ */
+ (void)snprintf(buf, sizeof(buf), conf/Makefile.kern.inc);
+ ifname = sourcepath(buf);
+ if ((ifp = fopen(ifname, r)) != NULL) {
+ while (fgets(line, sizeof(line), ifp) != NULL) {
+ fputc('+', stderr);
+ if (strncmp(line, build_kernel:, 13) == 0) {
+has_build_kernel = 1;
+break;
+ }
+ }
+ }
+ if (ifp == NULL) {
+ warn(cannot read %s, ifname);
+ goto bad2;
+ }
+ (void)fclose(ifp);
+
+ /*
+ * Try a makefile for the port first.
*/
(void)snprintf(buf, sizeof(buf), arch/%s/conf/Makefile.%s,
machine, machine);
@@ -579,9 +606,22 @@ emitload(FILE *fp)
fprintf(fp, .WAIT);
}
fputs(\n\n, fp);
+ /*
+ * Generate the backward-compatible build_kernel rule if
+ * sys/conf/Makefile.kern.inc doesn't define any (pre-2014 Aug).
+ */
+ if (has_build_kernel == 0) {
+ fprintf(fp, build_kernel: .USE\n
+ \t${SYSTEM_LD_HEAD}\n
+ \t${SYSTEM_LD} swap${.TARGET}.o\n
+ \t${SYSTEM_LD_TAIL}\n
+ \n);
+ }
+ /*
+ * Generate per-kernel rules.
+ */
TAILQ_FOREACH(cf, allcf, cf_next) {
fprintf(fp, KERNELS+=%s\n, cf-cf_name);
- fprintf(fp, build_kernel:\n);
fprintf(fp, %s: ${SYSTEM_DEP} swap%s.o vers.o build_kernel\n,
cf-cf_name, cf-cf_name);
fprintf(fp, swap%s.o: swap%s.c\n
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Mon Dec 15 15:49:25 UTC 2014
Modified Files:
src/usr.bin/config: mkmakefile.c
Log Message:
Revert debug code. Simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/config/mkmakefile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.36 src/usr.bin/config/mkmakefile.c:1.37
--- src/usr.bin/config/mkmakefile.c:1.36 Mon Dec 15 15:41:18 2014
+++ src/usr.bin/config/mkmakefile.c Mon Dec 15 15:49:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.36 2014/12/15 15:41:18 uebayasi Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.37 2014/12/15 15:49:25 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkmakefile.c,v 1.36 2014/12/15 15:41:18 uebayasi Exp $);
+__RCSID($NetBSD: mkmakefile.c,v 1.37 2014/12/15 15:49:25 uebayasi Exp $);
#include sys/param.h
#include ctype.h
@@ -106,19 +106,16 @@ mkmakefile(void)
*/
(void)snprintf(buf, sizeof(buf), conf/Makefile.kern.inc);
ifname = sourcepath(buf);
- if ((ifp = fopen(ifname, r)) != NULL) {
- while (fgets(line, sizeof(line), ifp) != NULL) {
- fputc('+', stderr);
- if (strncmp(line, build_kernel:, 13) == 0) {
-has_build_kernel = 1;
-break;
- }
- }
- }
- if (ifp == NULL) {
+ if ((ifp = fopen(ifname, r)) == NULL) {
warn(cannot read %s, ifname);
goto bad2;
}
+ while (fgets(line, sizeof(line), ifp) != NULL) {
+ if (strncmp(line, build_kernel:, 13) == 0) {
+ has_build_kernel = 1;
+ break;
+ }
+ }
(void)fclose(ifp);
/*
CVS commit: src/external/bsd/cron/dist
Module Name:src
Committed By: christos
Date: Mon Dec 15 16:45:26 UTC 2014
Modified Files:
src/external/bsd/cron/dist: crontab.c
Log Message:
- Don't allow bypassing file size limits with crontabs from stdin.
- Allow signals while reading the user crontab file; doing crontab -
does not let you abort otherwise, and doing ^Z, kill %1 leaves turds
in /var/cron/tabs
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/cron/dist/crontab.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/cron/dist/crontab.c
diff -u src/external/bsd/cron/dist/crontab.c:1.11 src/external/bsd/cron/dist/crontab.c:1.12
--- src/external/bsd/cron/dist/crontab.c:1.11 Sun Sep 7 09:34:12 2014
+++ src/external/bsd/cron/dist/crontab.c Mon Dec 15 11:45:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: crontab.c,v 1.11 2014/09/07 13:34:12 joerg Exp $ */
+/* $NetBSD: crontab.c,v 1.12 2014/12/15 16:45:26 christos Exp $ */
/* Copyright 1988,1990,1993,1994 by Paul Vixie
* All rights reserved
@@ -25,7 +25,7 @@
#if 0
static char rcsid[] = Id: crontab.c,v 1.12 2004/01/23 18:56:42 vixie Exp;
#else
-__RCSID($NetBSD: crontab.c,v 1.11 2014/09/07 13:34:12 joerg Exp $);
+__RCSID($NetBSD: crontab.c,v 1.12 2014/12/15 16:45:26 christos Exp $);
#endif
#endif
@@ -169,7 +169,7 @@ compare_time(const struct stat *st, cons
{
struct timespec ts1[2];
get_time(st, ts1);
-
+
return ts1[1].tv_sec == ts2[1].tv_sec
#if defined(HAVE_UTIMENSAT)
ts1[1].tv_nsec == ts2[1].tv_nsec
@@ -286,7 +286,7 @@ skip_header(int *pch, FILE *f)
{
int ch;
int x;
-
+
/* ignore the top few comments since we probably put them there.
*/
for (x = 0; x NHEADER_LINES; x++) {
@@ -554,15 +554,81 @@ edit_cmd(void) {
log_it(RealUser, Pid, END EDIT, User);
}
+static size_t
+getmaxtabsize(void)
+{
+ char n2[MAX_FNAME];
+ FILE *fmaxtabsize;
+ size_t maxtabsize;
+
+ /* Make sure that the crontab is not an unreasonable size.
+ *
+ * XXX This is subject to a race condition--the user could
+ * add stuff to the file after we've checked the size but
+ * before we slurp it in and write it out. We can't just move
+ * the test to test the temp file we later create, because by
+ * that time we've already filled up the crontab disk. Probably
+ * the right thing to do is to do a bytecount in the copy loop
+ * rather than stating the file we're about to read.
+ */
+ (void)snprintf(n2, sizeof(n2), %s/%s, CRONDIR, MAXTABSIZE_FILE);
+ if ((fmaxtabsize = fopen(n2, r)) != NULL) {
+ if (fgets(n2, (int)sizeof(n2), fmaxtabsize) == NULL) {
+ maxtabsize = 0;
+ } else {
+ maxtabsize = (size_t)atoi(n2);
+ }
+ (void)fclose(fmaxtabsize);
+ } else {
+ maxtabsize = MAXTABSIZE_DEFAULT;
+ }
+ return maxtabsize;
+}
+
+static int
+checkmaxtabsize(FILE *fp, size_t maxtabsize)
+{
+ struct stat statbuf;
+
+ if (fstat(fileno(fp), statbuf)) {
+ warn(error stat'ing crontab input);
+ return 0;
+ }
+ if ((uintmax_t)statbuf.st_size (uintmax_t)maxtabsize) {
+ warnx(%ju bytes is larger than the maximum size of %ju bytes,
+ (uintmax_t)statbuf.st_size, (uintmax_t)maxtabsize);
+ return 0;
+ }
+ return 1;
+}
+
+static void
+cleanTempFile(void)
+{
+
+ if (TempFilename[0]) {
+ (void) unlink(TempFilename);
+ TempFilename[0] = '\0';
+ }
+}
+
+static void
+bail(int signo)
+{
+
+ cleanTempFile();
+ errx(ERROR_EXIT, Exiting on signal %d, signo);
+}
+
/* returns 0 on success
* -1 on syntax error
* -2 on install error
*/
static int
replace_cmd(void) {
- char n[MAX_FNAME], n2[MAX_FNAME], envstr[MAX_ENVSTR];
+ char n[MAX_FNAME], envstr[MAX_ENVSTR];
int lastch;
- FILE *tmp, *fmaxtabsize;
+ FILE *tmp = NULL;
int ch, eof, fd;
int error = 0;
entry *e;
@@ -570,8 +636,7 @@ replace_cmd(void) {
uid_t file_owner;
time_t now = time(NULL);
char **envp = env_init();
- size_t maxtabsize;
- struct stat statbuf;
+ size_t i, maxtabsize;
if (envp == NULL) {
warn(Cannot allocate memory.);
@@ -584,71 +649,62 @@ replace_cmd(void) {
warnx(path too long);
return (-2);
}
+
+ /* Interruptible while doing I/O */
+ ohup = signal(SIGHUP, bail);
+ oint = signal(SIGINT, bail);
+ oquit = signal(SIGQUIT, bail);
+ oabrt = signal(SIGABRT, bail);
+
if ((fd = mkstemp(TempFilename)) == -1 || !(tmp = fdopen(fd, w+))) {
warn(cannot create `%s', TempFilename);
- if (fd != -1) {
+ if (fd != -1)
(void)close(fd);
- (void)unlink(TempFilename);
- }
- TempFilename[0] = '\0';
- return (-2);
+ error = -2;
+ goto done;
}
- ohup = signal(SIGHUP, SIG_IGN);
- oint = signal(SIGINT, SIG_IGN);
- oquit = signal(SIGQUIT, SIG_IGN);
- oabrt = signal(SIGABRT, SIG_IGN);
-
- /* Make sure that the crontab is not an unreasonable size.
- *
- * XXX This is subject to a race condition--the user could
- * add stuff to the file after we've checked the size but
- * before we slurp it in and write it out. We can't just move
- * the test
CVS commit: src/usr.sbin/cpuctl
Module Name:src Committed By: msaitoh Date: Tue Dec 16 04:07:40 UTC 2014 Modified Files: src/usr.sbin/cpuctl: cpuctl.c Log Message: Fix a bug that an unknown command is printed as (null). Reported by Fredrik Pettai. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/cpuctl/cpuctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/cpuctl/cpuctl.c diff -u src/usr.sbin/cpuctl/cpuctl.c:1.24 src/usr.sbin/cpuctl/cpuctl.c:1.25 --- src/usr.sbin/cpuctl/cpuctl.c:1.24 Thu Nov 20 12:49:13 2014 +++ src/usr.sbin/cpuctl/cpuctl.c Tue Dec 16 04:07:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuctl.c,v 1.24 2014/11/20 12:49:13 msaitoh Exp $ */ +/* $NetBSD: cpuctl.c,v 1.25 2014/12/16 04:07:40 msaitoh Exp $ */ /*- * Copyright (c) 2007, 2008, 2009, 2012 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #ifndef lint #include sys/cdefs.h -__RCSID($NetBSD: cpuctl.c,v 1.24 2014/11/20 12:49:13 msaitoh Exp $); +__RCSID($NetBSD: cpuctl.c,v 1.25 2014/12/16 04:07:40 msaitoh Exp $); #endif /* not lint */ #include sys/param.h @@ -119,7 +119,7 @@ main(int argc, char **argv) } if (ct-label == NULL) - errx(EXIT_FAILURE, unknown command ``%s'', argv[optind]); + errx(EXIT_FAILURE, unknown command ``%s'', argv[0]); close(fd); exit(EXIT_SUCCESS);
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: jnemeth
Date: Tue Dec 16 05:30:40 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
add powerpc variants to the list of potentially obsolete modules to check
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.186 src/usr.sbin/postinstall/postinstall:1.187
--- src/usr.sbin/postinstall/postinstall:1.186 Sat Dec 13 02:35:02 2014
+++ src/usr.sbin/postinstall/postinstall Tue Dec 16 05:30:40 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.186 2014/12/13 02:35:02 uebayasi Exp $
+# $NetBSD: postinstall,v 1.187 2014/12/16 05:30:40 jnemeth Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2142,6 +2142,8 @@ do_obsolete_stand()
for dir in \
/stand/${MACHINE} \
+ /stand/${MACHINE}-4xx \
+ /stand/${MACHINE}-booke \
/stand/${MACHINE}-xen \
/stand/${MACHINE}pae-xen
do
CVS import: xsrc/external/mit/glw/dist
Module Name:xsrc Committed By: mrg Date: Tue Dec 16 06:01:16 UTC 2014 Update of /cvsroot/xsrc/external/mit/glw/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16454 Log Message: initial import of glw-8.0.0 Status: Vendor Tag: xorg Release Tags: glw-8-0-0 N xsrc/external/mit/glw/dist/GLwMDrawA.c N xsrc/external/mit/glw/dist/configure N xsrc/external/mit/glw/dist/configure.ac N xsrc/external/mit/glw/dist/Makefile.in N xsrc/external/mit/glw/dist/config.guess N xsrc/external/mit/glw/dist/aclocal.m4 N xsrc/external/mit/glw/dist/Makefile.am N xsrc/external/mit/glw/dist/glw.pc.in N xsrc/external/mit/glw/dist/compile N xsrc/external/mit/glw/dist/depcomp N xsrc/external/mit/glw/dist/GLwDrawA.c N xsrc/external/mit/glw/dist/GLwMDrawA.h N xsrc/external/mit/glw/dist/config.sub N xsrc/external/mit/glw/dist/README N xsrc/external/mit/glw/dist/GLwMDrawAP.h N xsrc/external/mit/glw/dist/ltmain.sh N xsrc/external/mit/glw/dist/install-sh N xsrc/external/mit/glw/dist/GLwDrawAP.h N xsrc/external/mit/glw/dist/missing N xsrc/external/mit/glw/dist/GLwDrawA.h No conflicts created by this import
CVS import: xsrc/external/mit/glu/dist
Module Name:xsrc Committed By: mrg Date: Tue Dec 16 06:01:15 UTC 2014 Update of /cvsroot/xsrc/external/mit/glu/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8956 Log Message: initial import of glu-9.0.0 Status: Vendor Tag: xorg Release Tags: glu-9-0-0 N xsrc/external/mit/glu/dist/install-sh N xsrc/external/mit/glu/dist/configure N xsrc/external/mit/glu/dist/config.guess N xsrc/external/mit/glu/dist/missing N xsrc/external/mit/glu/dist/configure.ac N xsrc/external/mit/glu/dist/Makefile.in N xsrc/external/mit/glu/dist/depcomp N xsrc/external/mit/glu/dist/Makefile.am N xsrc/external/mit/glu/dist/config.sub N xsrc/external/mit/glu/dist/aclocal.m4 N xsrc/external/mit/glu/dist/ltmain.sh N xsrc/external/mit/glu/dist/glu.pc.in N xsrc/external/mit/glu/dist/src/libtess/priorityq-heap.c N xsrc/external/mit/glu/dist/src/libtess/mesh.c N xsrc/external/mit/glu/dist/src/libtess/render.h N xsrc/external/mit/glu/dist/src/libtess/tessmono.h N xsrc/external/mit/glu/dist/src/libtess/sweep.c N xsrc/external/mit/glu/dist/src/libtess/mesh.h N xsrc/external/mit/glu/dist/src/libtess/tess.c N xsrc/external/mit/glu/dist/src/libtess/sweep.h N xsrc/external/mit/glu/dist/src/libtess/normal.c N xsrc/external/mit/glu/dist/src/libtess/priorityq-sort.h N xsrc/external/mit/glu/dist/src/libtess/priorityq.h N xsrc/external/mit/glu/dist/src/libtess/dict-list.h N xsrc/external/mit/glu/dist/src/libtess/geom.h N xsrc/external/mit/glu/dist/src/libtess/geom.c N xsrc/external/mit/glu/dist/src/libtess/memalloc.c N xsrc/external/mit/glu/dist/src/libtess/dict.h N xsrc/external/mit/glu/dist/src/libtess/dict.c N xsrc/external/mit/glu/dist/src/libtess/render.c N xsrc/external/mit/glu/dist/src/libtess/priorityq-heap.h N xsrc/external/mit/glu/dist/src/libtess/priorityq.c N xsrc/external/mit/glu/dist/src/libtess/tessmono.c N xsrc/external/mit/glu/dist/src/libtess/memalloc.h N xsrc/external/mit/glu/dist/src/libtess/normal.h N xsrc/external/mit/glu/dist/src/libtess/tess.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/bezierPatchMesh.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/glcurveval.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/bezierEval.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/mystdlib.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/bezierPatchMesh.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/bezierPatch.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/glimports.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/glrenderer.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/glrenderer.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/glinterface.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/bezierPatch.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/incurveeval.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/bezierEval.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/insurfeval.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/glsurfeval.cc N xsrc/external/mit/glu/dist/src/libnurbs/interface/glsurfeval.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/mystdio.h N xsrc/external/mit/glu/dist/src/libnurbs/interface/glcurveval.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/trimvertpool.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/hull.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/types.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/displaylist.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/uarray.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/coveandtiler.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/bufpool.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/arctess.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/sorter.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/displaymode.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/quilt.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/flist.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/dataTransform.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/jarcloc.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/flist.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/monotonizer.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/subdivider.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/basiccrveval.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/backend.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/patch.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/monotonizer.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/mymath.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/trimline.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/monoTriangulationBackend.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/gridtrimvertex.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/subdivider.h N xsrc/external/mit/glu/dist/src/libnurbs/internals/trimregion.cc N xsrc/external/mit/glu/dist/src/libnurbs/internals/tobezier.cc N
CVS import: xsrc/external/mit/mesa-demos/dist
Module Name:xsrc Committed By: mrg Date: Tue Dec 16 06:01:20 UTC 2014 Update of /cvsroot/xsrc/external/mit/mesa-demos/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27795 Log Message: initial import of mesa-demos-8.2.0 Status: Vendor Tag: xorg Release Tags: mesa-demos-8-2-0 N xsrc/external/mit/mesa-demos/dist/compile N xsrc/external/mit/mesa-demos/dist/configure N xsrc/external/mit/mesa-demos/dist/missing N xsrc/external/mit/mesa-demos/dist/ltmain.sh N xsrc/external/mit/mesa-demos/dist/aclocal.m4 N xsrc/external/mit/mesa-demos/dist/depcomp N xsrc/external/mit/mesa-demos/dist/config.sub N xsrc/external/mit/mesa-demos/dist/config.guess N xsrc/external/mit/mesa-demos/dist/Makefile.in N xsrc/external/mit/mesa-demos/dist/install-sh N xsrc/external/mit/mesa-demos/dist/configure.ac N xsrc/external/mit/mesa-demos/dist/Makefile.am N xsrc/external/mit/mesa-demos/dist/src/Makefile.in N xsrc/external/mit/mesa-demos/dist/src/Makefile.am N xsrc/external/mit/mesa-demos/dist/src/tests/getprocaddress.py N xsrc/external/mit/mesa-demos/dist/src/tests/texcompress2.c N xsrc/external/mit/mesa-demos/dist/src/tests/bug_3195.c N xsrc/external/mit/mesa-demos/dist/src/tests/arbfptexture.c N xsrc/external/mit/mesa-demos/dist/src/tests/minmag.c N xsrc/external/mit/mesa-demos/dist/src/tests/texcomp_image.h N xsrc/external/mit/mesa-demos/dist/src/tests/quads.c N xsrc/external/mit/mesa-demos/dist/src/tests/stencilreaddraw.c N xsrc/external/mit/mesa-demos/dist/src/tests/mipgen.c N xsrc/external/mit/mesa-demos/dist/src/tests/stencilwrap.c N xsrc/external/mit/mesa-demos/dist/src/tests/bug_3101.c N xsrc/external/mit/mesa-demos/dist/src/tests/fbotest3.c N xsrc/external/mit/mesa-demos/dist/src/tests/antialias.c N xsrc/external/mit/mesa-demos/dist/src/tests/zdrawpix.c N xsrc/external/mit/mesa-demos/dist/src/tests/shader_api.c N xsrc/external/mit/mesa-demos/dist/src/tests/texleak.c N xsrc/external/mit/mesa-demos/dist/src/tests/arbvparray.c N xsrc/external/mit/mesa-demos/dist/src/tests/zbitmap.c N xsrc/external/mit/mesa-demos/dist/src/tests/condrender.c N xsrc/external/mit/mesa-demos/dist/src/tests/zcomp.c N xsrc/external/mit/mesa-demos/dist/src/tests/arbnpot-mipmap.c N xsrc/external/mit/mesa-demos/dist/src/tests/texdown.c N xsrc/external/mit/mesa-demos/dist/src/tests/drawbuffers2.c N xsrc/external/mit/mesa-demos/dist/src/tests/step.c N xsrc/external/mit/mesa-demos/dist/src/tests/vpwarpmesh.c N xsrc/external/mit/mesa-demos/dist/src/tests/clip.c N xsrc/external/mit/mesa-demos/dist/src/tests/random.c N xsrc/external/mit/mesa-demos/dist/src/tests/tex1d.c N xsrc/external/mit/mesa-demos/dist/src/tests/pbo.c N xsrc/external/mit/mesa-demos/dist/src/tests/mipmap_tunnel.c N xsrc/external/mit/mesa-demos/dist/src/tests/texrect.c N xsrc/external/mit/mesa-demos/dist/src/tests/readrate.c N xsrc/external/mit/mesa-demos/dist/src/tests/bug_texstore_i8.c N xsrc/external/mit/mesa-demos/dist/src/tests/no_s3tc.c N xsrc/external/mit/mesa-demos/dist/src/tests/subtex.c N xsrc/external/mit/mesa-demos/dist/src/tests/cva.c N xsrc/external/mit/mesa-demos/dist/src/tests/arbvpwarpmesh.c N xsrc/external/mit/mesa-demos/dist/src/tests/copypixrate.c N xsrc/external/mit/mesa-demos/dist/src/tests/rubberband.c N xsrc/external/mit/mesa-demos/dist/src/tests/prim.c N xsrc/external/mit/mesa-demos/dist/src/tests/linehacks.c N xsrc/external/mit/mesa-demos/dist/src/tests/bufferobj.c N xsrc/external/mit/mesa-demos/dist/src/tests/tkmap.c N xsrc/external/mit/mesa-demos/dist/src/tests/scissor.c N xsrc/external/mit/mesa-demos/dist/src/tests/texobjshare.c N xsrc/external/mit/mesa-demos/dist/src/tests/fillrate.c N xsrc/external/mit/mesa-demos/dist/src/tests/Makefile.in N xsrc/external/mit/mesa-demos/dist/src/tests/fptest1.c N xsrc/external/mit/mesa-demos/dist/src/tests/getprocaddress.c N xsrc/external/mit/mesa-demos/dist/src/tests/arraytexture.c N xsrc/external/mit/mesa-demos/dist/src/tests/arbvptorus.c N xsrc/external/mit/mesa-demos/dist/src/tests/zreaddraw.c N xsrc/external/mit/mesa-demos/dist/src/tests/manytex.c N xsrc/external/mit/mesa-demos/dist/src/tests/fogcoord.c N xsrc/external/mit/mesa-demos/dist/src/tests/arbnpot.c N xsrc/external/mit/mesa-demos/dist/src/tests/shader-interp.c N xsrc/external/mit/mesa-demos/dist/src/tests/prog_parameter.c N xsrc/external/mit/mesa-demos/dist/src/tests/mapbufrange.c N xsrc/external/mit/mesa-demos/dist/src/tests/vpeval.c N xsrc/external/mit/mesa-demos/dist/src/tests/arbfpspec.c N xsrc/external/mit/mesa-demos/dist/src/tests/blitfb.c N xsrc/external/mit/mesa-demos/dist/src/tests/yuvrect.c N xsrc/external/mit/mesa-demos/dist/src/tests/drawstencil.c N xsrc/external/mit/mesa-demos/dist/src/tests/floattex.c N xsrc/external/mit/mesa-demos/dist/src/tests/scissor-viewport.c N xsrc/external/mit/mesa-demos/dist/src/tests/texcompsub.c N xsrc/external/mit/mesa-demos/dist/src/tests/texfilt.c N xsrc/external/mit/mesa-demos/dist/src/tests/vptest2.c N xsrc/external/mit/mesa-demos/dist/src/tests/invert.c N
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Tue Dec 16 06:04:10 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add X11SRCDIR entries for the new separated mesa components.
To generate a diff of this commit:
cvs rdiff -u -r1.837 -r1.838 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.837 src/share/mk/bsd.own.mk:1.838
--- src/share/mk/bsd.own.mk:1.837 Tue Nov 25 12:01:18 2014
+++ src/share/mk/bsd.own.mk Tue Dec 16 06:04:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.837 2014/11/25 12:01:18 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.838 2014/12/16 06:04:10 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1268,8 +1268,9 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
xtrans fontconfig expat freetype evieext mkfontscale bdftopcf \
xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata xkeyboard-config \
xbitmaps appres xeyes xev xedit sessreg pixman \
- beforelight bitmap editres makedepend fonttosfnt fslsfonts \
- fstobdf MesaDemos MesaGLUT MesaLib ico iceauth lbxproxy listres lndir \
+ beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
+ glu glw mesa-demos MesaDemos MesaGLUT MesaLib \
+ ico iceauth lbxproxy listres lndir \
luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \
xclock xcmsdb xconsole xcutsel xditview xdpyinfo xdriinfo xdm \
CVS commit: src/external/mit/xorg/lib/libGLU
Module Name:src
Committed By: mrg
Date: Tue Dec 16 06:10:12 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libGLU: Makefile
Log Message:
switch over to the separate glu sources.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/libGLU/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.15 src/external/mit/xorg/lib/libGLU/Makefile:1.16
--- src/external/mit/xorg/lib/libGLU/Makefile:1.15 Mon Jul 14 00:22:46 2014
+++ src/external/mit/xorg/lib/libGLU/Makefile Tue Dec 16 06:10:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/07/14 00:22:46 riz Exp $
+# $NetBSD: Makefile,v 1.16 2014/12/16 06:10:12 mrg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -7,67 +7,127 @@ NOLINT= 1 # XTODO: tess.ln SIGSEGVs lin
LIB= GLU
LIBISCXX= yes
-GLUDIR= ${X11SRCDIR.MesaLib}/src/glu/sgi
+GLUDIR= ${X11SRCDIR.glu}/src
-SRCS.libutil= error.c glue.c mipmap.c project.c quad.c registry.c
+SRCS.libutil= \
+ error.c \
+ glue.c \
+ mipmap.c \
+ project.c \
+ quad.c \
+ registry.c
.PATH: ${GLUDIR}/libutil
-SRCS.libtess= dict.c geom.c memalloc.c mesh.c normal.c priorityq.c \
- render.c sweep.c tess.c tessmono.c
+SRCS.libtess= \
+ dict.c \
+ geom.c \
+ memalloc.c \
+ mesh.c \
+ normal.c \
+ priorityq.c \
+ render.c \
+ sweep.c \
+ tess.c \
+ tessmono.c
.PATH: ${GLUDIR}/libtess
-SRCS.interface= bezierEval.cc bezierPatch.cc bezierPatchMesh.cc \
- glcurveval.cc glinterface.cc glrenderer.cc \
- glsurfeval.cc incurveeval.cc insurfeval.cc
+SRCS.interface= \
+ bezierEval.cc \
+ bezierPatch.cc \
+ bezierPatchMesh.cc \
+ glcurveval.cc \
+ glinterface.cc \
+ glrenderer.cc \
+ glsurfeval.cc \
+ incurveeval.cc \
+ insurfeval.cc
.PATH: ${GLUDIR}/libnurbs/interface
-.for fn in ${SRCS.interface}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
- -I${GLUDIR}/libnurbs/nurbtess \
- -DLIBRARYBUILD
-.endfor
-SRCS.internals= arc.cc arcsorter.cc arctess.cc backend.cc \
- basiccrveval.cc basicsurfeval.cc bin.cc bufpool.cc \
- cachingeval.cc ccw.cc coveandtiler.cc curve.cc \
- curvelist.cc curvesub.cc dataTransform.cc displaylist.cc \
- flist.cc flistsorter.cc hull.cc intersect.cc \
- knotvector.cc mapdesc.cc mapdescv.cc maplist.cc \
- mesher.cc monoTriangulationBackend.cc monotonizer.cc \
- mycode.cc nurbsinterfac.cc nurbstess.cc patch.cc \
- patchlist.cc quilt.cc reader.cc renderhints.cc \
- slicer.cc sorter.cc splitarcs.cc subdivider.cc \
- tobezier.cc trimline.cc trimregion.cc trimvertpool.cc \
- uarray.cc varray.cc
+SRCS.internals= \
+ arc.cc \
+ arcsorter.cc \
+ arctess.cc \
+ backend.cc \
+ basiccrveval.cc \
+ basicsurfeval.cc \
+ bin.cc \
+ bufpool.cc \
+ cachingeval.cc \
+ ccw.cc \
+ coveandtiler.cc \
+ curve.cc \
+ curvelist.cc \
+ curvesub.cc \
+ dataTransform.cc \
+ displaylist.cc \
+ flist.cc \
+ flistsorter.cc \
+ hull.cc \
+ intersect.cc \
+ knotvector.cc \
+ mapdesc.cc \
+ mapdescv.cc \
+ maplist.cc \
+ mesher.cc \
+ monoTriangulationBackend.cc \
+ monotonizer.cc \
+ mycode.cc \
+ nurbsinterfac.cc \
+ nurbstess.cc \
+ patch.cc \
+ patchlist.cc \
+ quilt.cc \
+ reader.cc \
+ renderhints.cc \
+ slicer.cc \
+ sorter.cc \
+ splitarcs.cc \
+ subdivider.cc \
+ tobezier.cc \
+ trimline.cc \
+ trimregion.cc \
+ trimvertpool.cc \
+ uarray.cc \
+ varray.cc
.PATH: ${GLUDIR}/libnurbs/internals
.for fn in ${SRCS.internals}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
- -I${GLUDIR}/libnurbs/nurbtess \
- -I${GLUDIR}/libutil \
- -DLIBRARYBUILD -D_EXTENSIONS_
+CPPFLAGS.${fn}+= -D_EXTENSIONS_
.endfor
-SRCS.nurbtess= directedLine.cc gridWrap.cc monoChain.cc monoPolyPart.cc \
- monoTriangulation.cc partitionX.cc partitionY.cc \
- polyDBG.cc polyUtil.cc primitiveStream.cc quicksort.cc \
- rectBlock.cc sampleComp.cc sampleCompBot.cc \
- sampleCompRight.cc sampleCompTop.cc sampleMonoPoly.cc \
- sampledLine.cc searchTree.cc
+SRCS.nurbtess= \
+ directedLine.cc \
+ gridWrap.cc \
+ monoChain.cc \
+ monoPolyPart.cc \
+ monoTriangulation.cc \
+ partitionX.cc \
+ partitionY.cc \
+ polyDBG.cc \
+ polyUtil.cc \
+ primitiveStream.cc \
+ quicksort.cc \
+ rectBlock.cc \
+ sampleComp.cc \
+ sampleCompBot.cc \
+ sampleCompRight.cc \
+ sampleCompTop.cc \
+ sampleMonoPoly.cc \
+ sampledLine.cc \
+ searchTree.cc
.PATH: ${GLUDIR}/libnurbs/nurbtess
-.for fn in ${SRCS.nurbtess}
-CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \
- -I${GLUDIR}/libnurbs/nurbtess \
- -DLIBRARYBUILD
-.endfor
-CPPFLAGS+= -I${GLUDIR}/include
CPPFLAGS+= -DPTHREADS -DUSE_XSHM -DHZ=100 -DNDEBUG -DLIBRARYBUILD
+CPPFLAGS+= -I${GLUDIR}/include \
+ -I${GLUDIR}/libnurbs/internals \
+ -I${GLUDIR}/libnurbs/interface \
+ -I${GLUDIR}/libnurbs/nurbtess
SRCS= ${SRCS.libutil} ${SRCS.libtess} \
${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
CFLAGS+= -fno-strict-aliasing
