CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Jan 30 10:09:59 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Change from 3400 USB to 3400 USB EHCI for EHCI devices. To generate a diff of this commit: cvs rdiff -u -r1.1146 -r1.1147 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.1146 src/sys/dev/pci/pcidevs:1.1147 --- src/sys/dev/pci/pcidevs:1.1146 Thu Dec 6 12:46:49 2012 +++ src/sys/dev/pci/pcidevs Wed Jan 30 10:09:58 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1146 2012/12/06 12:46:49 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1147 2013/01/30 10:09:58 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3280,14 +3280,14 @@ product INTEL 3400_SATA_6 0x3b2e 3400 SA product INTEL 3400_AHCI_4 0x3b2f 3400 AHCI product INTEL 3400_SMB 0x3b30 3400 SMBus product INTEL 3400_THERMAL 0x3b32 3400 Thermal -product INTEL 3400_EHCI_1 0x3b34 3400 USB +product INTEL 3400_EHCI_1 0x3b34 3400 USB EHCI product INTEL 3400_UHCI_1 0x3b36 3400 USB product INTEL 3400_UHCI_2 0x3b37 3400 USB product INTEL 3400_UHCI_3 0x3b38 3400 USB product INTEL 3400_UHCI_4 0x3b39 3400 USB product INTEL 3400_UHCI_5 0x3b3a 3400 USB product INTEL 3400_UHCI_6 0x3b3b 3400 USB -product INTEL 3400_EHCI_2 0x3b3c 3400 USB +product INTEL 3400_EHCI_2 0x3b3c 3400 USB ECHI product INTEL 3400_UHCI_7 0x3b3e 3400 USB product INTEL 3400_UHCI_8 0x3b3f 3400 USB product INTEL 3400_PCIE_1 0x3b42 3400 PCIE
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: jmcneill Date: Wed Jan 30 11:52:54 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm2835_rng.c Log Message: discard initial numbers from rng, broadcom says they are less random To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_rng.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_rng.c diff -u src/sys/arch/arm/broadcom/bcm2835_rng.c:1.1 src/sys/arch/arm/broadcom/bcm2835_rng.c:1.2 --- src/sys/arch/arm/broadcom/bcm2835_rng.c:1.1 Fri Jan 25 00:04:06 2013 +++ src/sys/arch/arm/broadcom/bcm2835_rng.c Wed Jan 30 11:52:54 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_rng.c,v 1.1 2013/01/25 00:04:06 jmcneill Exp $ */ +/* $NetBSD: bcm2835_rng.c,v 1.2 2013/01/30 11:52:54 jmcneill Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bcm2835_rng.c,v 1.1 2013/01/25 00:04:06 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: bcm2835_rng.c,v 1.2 2013/01/30 11:52:54 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -109,6 +109,9 @@ bcmrng_attach(device_t parent, device_t callout_init(sc-sc_tick, CALLOUT_MPSAFE); callout_setfunc(sc-sc_tick, bcmrng_tick, sc); + /* discard initial numbers, broadcom says they are less random */ + bus_space_write_4(sc-sc_iot, sc-sc_ioh, RNG_STATUS, 0x4); + /* enable rng */ ctrl = bus_space_read_4(sc-sc_iot, sc-sc_ioh, RNG_CTRL); ctrl |= RNG_CTRL_EN;
CVS commit: src/distrib
Module Name:src
Committed By: he
Date: Wed Jan 30 13:47:36 UTC 2013
Modified Files:
src/distrib/common: Makefile.mdset
src/distrib/evbarm/gzboot/gzimg: Makefile
Log Message:
Fix the ALL_KERNELS default value assignment, so that the double
quotes don't become a part of the value, causing all the targets
to be skipped by default.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.23 -r1.24 src/distrib/evbarm/gzboot/gzimg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.36 src/distrib/common/Makefile.mdset:1.37
--- src/distrib/common/Makefile.mdset:1.36 Sun Jan 13 14:43:23 2013
+++ src/distrib/common/Makefile.mdset Wed Jan 30 13:47:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.36 2013/01/13 14:43:23 mlelstv Exp $
+# $NetBSD: Makefile.mdset,v 1.37 2013/01/30 13:47:36 he Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -69,7 +69,9 @@ _MAKEFILE_MDSET_=1
.include bsd.kernobj.mk
-ALL_KERNELS?= +
+# The default is to build for all MDSETTARGETS
+ALL_KERNELS?= +
+
.for _K _I _F in ${MDSETTARGETS} # {
.for currentsel in ${ALL_KERNELS} # {
.if ${currentsel} == + || ${_K} == ${currentsel}
Index: src/distrib/evbarm/gzboot/gzimg/Makefile
diff -u src/distrib/evbarm/gzboot/gzimg/Makefile:1.23 src/distrib/evbarm/gzboot/gzimg/Makefile:1.24
--- src/distrib/evbarm/gzboot/gzimg/Makefile:1.23 Sun Jan 13 14:43:23 2013
+++ src/distrib/evbarm/gzboot/gzimg/Makefile Wed Jan 30 13:47:36 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/01/13 14:43:23 mlelstv Exp $
+# $NetBSD: Makefile,v 1.24 2013/01/30 13:47:36 he Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -62,7 +62,9 @@ TARGETS= ADI_BRH ADI_BRH ADI_BRH_sd0 \
0x0014 netbsd-wd0
.endif
-ALL_KERNELS?= +
+# Default is to build for all TARGETS
+ALL_KERNELS?= +
+
.for K G I R W in ${TARGETS}# {
.for configsel in ${ALL_KERNELS} # {
.if ${configsel} == + || ${configsel} == ${K}
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: he Date: Wed Jan 30 13:52:45 UTC 2013 Added Files: src/sys/arch/evbarm/conf: KUROBOX_PRO_INSTALL Log Message: Add an install kernel for KUROBOX_PRO. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/KUROBOX_PRO_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/KUROBOX_PRO_INSTALL diff -u /dev/null src/sys/arch/evbarm/conf/KUROBOX_PRO_INSTALL:1.1 --- /dev/null Wed Jan 30 13:52:45 2013 +++ src/sys/arch/evbarm/conf/KUROBOX_PRO_INSTALL Wed Jan 30 13:52:45 2013 @@ -0,0 +1,8 @@ +# $NetBSD: KUROBOX_PRO_INSTALL,v 1.1 2013/01/30 13:52:45 he Exp $ +# +# KUROBOX_PRO_INSTALL -- KUROBOX_PRO kernel with installation-sized +# ramdisk +# + +include arch/evbarm/conf/KUROBOX_PRO +include arch/evbarm/conf/INSTALL
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: he Date: Wed Jan 30 14:12:33 UTC 2013 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add newfs_ext2fs and mount_ext2fs, useful for installing on a hard disk on KUROBOX_PRO. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/evbarm/instkernel/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/evbarm/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.23 src/distrib/evbarm/instkernel/ramdisk/list:1.24 --- src/distrib/evbarm/instkernel/ramdisk/list:1.23 Fri Aug 10 20:17:09 2012 +++ src/distrib/evbarm/instkernel/ramdisk/list Wed Jan 30 14:12:33 2013 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.23 2012/08/10 20:17:09 matt Exp $ +# $NetBSD: list,v 1.24 2013/01/30 14:12:33 he Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -32,12 +32,14 @@ PROG sbin/init PROG sbin/mknod PROG sbin/mount PROG sbin/mount_cd9660 +PROG sbin/mount_ext2fs PROG sbin/mount_ffs PROG sbin/mount_kernfs PROG sbin/mount_msdos PROG sbin/mount_nfs PROG sbin/mount_tmpfs PROG sbin/newfs sbin/mount_mfs +PROG sbin/newfs_ext2fs PROG sbin/ping PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Jan 30 14:20:54 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
- Add WM_DEBUG_NVM.
- If WM_DEBUG_NVM is enabled, dump the FLASH ROM data.
To generate a diff of this commit:
cvs rdiff -u -r1.239 -r1.240 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.239 src/sys/dev/pci/if_wm.c:1.240
--- src/sys/dev/pci/if_wm.c:1.239 Wed Dec 12 09:20:35 2012
+++ src/sys/dev/pci/if_wm.c Wed Jan 30 14:20:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.239 2012/12/12 09:20:35 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.240 2013/01/30 14:20:53 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.239 2012/12/12 09:20:35 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.240 2013/01/30 14:20:53 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -132,8 +132,9 @@ __KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.
#define WM_DEBUG_RX 0x04
#define WM_DEBUG_GMII 0x08
#define WM_DEBUG_MANAGE 0x10
+#define WM_DEBUG_NVM 0x20
int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX | WM_DEBUG_LINK | WM_DEBUG_GMII
-| WM_DEBUG_MANAGE;
+| WM_DEBUG_MANAGE | WM_DEBUG_NVM;
#define DPRINTF(x, y) if (wm_debug (x)) printf y
#else
@@ -5260,6 +5261,32 @@ wm_validate_eeprom_checksum(struct wm_so
checksum = 0;
+#ifdef WM_DEBUG
+ /* Dump EEPROM image for debug */
+ if ((sc-sc_type == WM_T_ICH8) || (sc-sc_type == WM_T_ICH9)
+ || (sc-sc_type == WM_T_ICH10) || (sc-sc_type == WM_T_PCH)
+ || (sc-sc_type == WM_T_PCH2)) {
+ wm_read_eeprom(sc, 0x19, 1, eeprom_data);
+ if ((eeprom_data 0x40) == 0) {
+ DPRINTF(WM_DEBUG_NVM,(%s: NVM need to be updated\n,
+device_xname(sc-sc_dev)));
+ }
+ }
+
+ if ((wm_debug WM_DEBUG_NVM) != 0) {
+ printf(%s: NVM dump:\n, device_xname(sc-sc_dev));
+ for (i = 0; i EEPROM_SIZE; i++) {
+ if (wm_read_eeprom(sc, i, 1, eeprom_data))
+printf(XX );
+ else
+printf(%04x , eeprom_data);
+ if (i % 8 == 7)
+printf(\n);
+ }
+ }
+
+#endif /* WM_DEBUG */
+
for (i = 0; i EEPROM_SIZE; i++) {
if (wm_read_eeprom(sc, i, 1, eeprom_data))
return 1;
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: macallan Date: Wed Jan 30 15:55:28 UTC 2013 Modified Files: src/sys/arch/arm/omap: omapfbreg.h Log Message: moar register bits To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omapfbreg.h 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/omap/omapfbreg.h diff -u src/sys/arch/arm/omap/omapfbreg.h:1.1 src/sys/arch/arm/omap/omapfbreg.h:1.2 --- src/sys/arch/arm/omap/omapfbreg.h:1.1 Tue Aug 31 19:03:55 2010 +++ src/sys/arch/arm/omap/omapfbreg.h Wed Jan 30 15:55:27 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: omapfbreg.h,v 1.1 2010/08/31 19:03:55 macallan Exp $ */ +/* $NetBSD: omapfbreg.h,v 1.2 2013/01/30 15:55:27 macallan Exp $ */ /*- * Copyright (c) 2010 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: omapfbreg.h,v 1.1 2010/08/31 19:03:55 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: omapfbreg.h,v 1.2 2013/01/30 15:55:27 macallan Exp $); #ifndef OMAPFB_REG_H #define OMAPFB_REG_H @@ -85,14 +85,14 @@ __KERNEL_RCSID(0, $NetBSD: omapfbreg.h, #define OMAPFB_DISPC_VID1_BASE0 0x04bc #define OMAPFB_DISPC_VID1_BASE1 0x04c0 #define OMAPFB_DISPC_VID1_POSITION 0x04c4 -#define OMAPFB_DISPC_VID1_SIZE 0x04c8 +#define OMAPFB_DISPC_VID1_SIZE 0x04c8 /* displayed size */ #define OMAPFB_DISPC_VID1_ATTRIBUTES 0x04cc #define OMAPFB_DISPC_VID1_FIFO_THRESH 0x04d0 #define OMAPFB_DISPC_VID1_FIFO_SZ_STAT 0x04d4 #define OMAPFB_DISPC_VID1_ROW_INC 0x04d8 #define OMAPFB_DISPC_VID1_PIXEL_INC 0x04dc #define OMAPFB_DISPC_VID1_FIR 0x04e0 -#define OMAPFB_DISPC_VID1_PICTURE_SIZE 0x04e4 +#define OMAPFB_DISPC_VID1_PICTURE_SIZE 0x04e4 /* original size */ #define OMAPFB_DISPC_VID1_ACCU_0 0x04e8 #define OMAPFB_DISPC_VID1_ACCU_1 0x04ec #define OMAPFB_DISPC_VID1_COEFF_H_0 0x04d0 @@ -288,6 +288,8 @@ __KERNEL_RCSID(0, $NetBSD: omapfbreg.h, #define OMAP_DISPC_CTRL_PIXEL_CLOCK 0x0800 #define OMAP_DISPC_CTRL_GO_DIGITAL 0x0040 #define OMAP_DISPC_CTRL_GO_LCD 0x0020 +#define OMAP_DISPC_CTRL_MONO_8_BYTE 0x0010 /* 4 otherwise */ +#define OMAP_DISPC_CTRL_ACTIVE_MTRX 0x0008 /* disable STN dither */ #define OMAP_DISPC_CTRL_MONO 0x0004 #define OMAP_DISPC_CTRL_DIGITAL_ENABLE 0x0002 #define OMAP_DISPC_CTRL_LCD_ENABLE 0x0001 @@ -305,6 +307,67 @@ __KERNEL_RCSID(0, $NetBSD: omapfbreg.h, #define OMAP_VENCFCTL_FMT_ITU_422 0x0003 /* OMAPFB_DISPC_CONFIG */ +#define OMAP_DISPC_CFG_TV_ALPHA_EN 0x0008 +#define OMAP_DISPC_CFG_LCD_ALPHA_EN 0x0004 +#define OMAP_DISPC_CFG_FIFO_FILL_ALL 0x0002 /* fill all FIFOs if at least one is low */ +#define OMAP_DISPC_CFG_FIFOHANDCHECK 0x0001 +#define OMAP_DISPC_CFG_CPR 0x8000 /* color phase rotation */ +#define OMAP_DISPC_CFG_FIFOMERGE 0x4000 +#define OMAP_DISPC_CFG_TCKDIGSELECTION 0x2000 /* transp. color key */ +#define OMAP_DISPC_CFG_TCKDIGENABLE 0x1000 +#define OMAP_DISPC_CFG_TCKLCDSELECTION 0x0800 /* transp. color key */ +#define OMAP_DISPC_CFG_TCKLCDENABLE 0x0400 #define OMAP_DISPC_CFG_FUNCGATED 0x0200 /* functional clocks */ +#define OMAP_DISPC_CFG_ACBIAS_GATED 0x0100 +#define OMAP_DISPC_CFG_VSYNC_GATED 0x0080 +#define OMAP_DISPC_CFG_HSYNC_GATED 0x0040 +#define OMAP_DISPC_CFG_PIXELCLK_GATED 0x0020 +#define OMAP_DISPC_CFG_PIXELDATA_GATED 0x0010 +#define OMAP_DISPC_CFG_PALGAMMATABLE 0x0008 /* use LUT as gamma in 8bit */ +#define OMAP_DISPC_CFG_LUT_LOAD_ALWAYS 0x +#define OMAP_DISPC_CFG_LUT_LOAD 0x0002 +#define OMAP_DISPC_CFG_LUT_LOAD_F_ONLY 0x0004 /* only frame data */ +#define OMAP_DISPC_CFG_LUT_LOAD_ONCE 0x0006 /* load once, then 4 */ +#define OMAP_DISPC_CFG_PIXEL_GATED 0x0001 /* active matrix only */ + +/* OMAPFB_DISPC_VIDn_ATTRIBUTES */ +#define OMAP_VID_ATTR_SELFREFRESH 0x0100 /* no DMA, display from FIFO only */ +#define OMAP_VID_ATTR_HIGH_PRIORITY 0x0080 +#define OMAP_VID_ATTR_BUFFER_SPLIT 0x0040 +#define OMAP_VID_ATTR_TAP_5 0x0020 /* resize, 3 taps otherwise */ +#define OMAP_VID_ATTR_DMA_OPT 0x0010 /* for rotation */ +#define OMAP_VID_ATTR_FIFO_PRELOAD 0x0008 /* use high threshold reg */ +#define OMAP_VID_ATTR_ROWREPEAT 0x0004 /* for YUV */ +#define OMAP_VID_ATTR_BIG_ENDIAN 0x0002 +#define OMAP_VID_ATTR_CHANNEL_24BIT 0x0001 /* LCD otherwise */ +#define OMAP_VID_ATTR_BURST_4x32 0x +#define OMAP_VID_ATTR_BURST_8x32 0x4000 +#define OMAP_VID_ATTR_BURST_16x32 0x8000 +#define OMAP_VID_ATTR_BURST_MASK 0xc000 +#define OMAP_VID_ATTR_ROT_NONE 0x +#define OMAP_VID_ATTR_ROT_90 0x1000 +#define OMAP_VID_ATTR_ROT_180 0x2000 +#define OMAP_VID_ATTR_ROT_270 0x3000 +#define OMAP_VID_ATTR_ROT_MASK 0x3000 +#define OMAP_VID_ATTR_FULLRANGE 0x0800 /* YUV */ +#define OMAP_VID_ATTR_REPLICATION 0x0400 /* 16bit - 24bit */ +#define OMAP_VID_ATTR_COLORSPACE_CONV 0x0200 /*
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Wed Jan 30 16:01:45 UTC 2013
Modified Files:
src/sys/dev/usb: uhci.c
Log Message:
Add missed byteswap ops for BE machines in block added in rev 1.223.
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/sys/dev/usb/uhci.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/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.254 src/sys/dev/usb/uhci.c:1.255
--- src/sys/dev/usb/uhci.c:1.254 Tue Jan 29 19:27:36 2013
+++ src/sys/dev/usb/uhci.c Wed Jan 30 16:01:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.254 2013/01/29 19:27:36 christos Exp $ */
+/* $NetBSD: uhci.c,v 1.255 2013/01/30 16:01:45 tsutsui Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.254 2013/01/29 19:27:36 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.255 2013/01/30 16:01:45 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1865,8 +1865,8 @@ uhci_free_std_chain(uhci_softc_t *sc, uh
p-offs + offsetof(uhci_td_t, td_link),
sizeof(p-td.td_link),
BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
- if ((p-td.td_link UHCI_PTR_T) == 0) {
- p-td.td_link = UHCI_PTR_T;
+ if ((le32toh(p-td.td_link) UHCI_PTR_T) == 0) {
+ p-td.td_link = htole32(UHCI_PTR_T);
usb_syncmem(p-dma,
p-offs + offsetof(uhci_td_t, td_link),
sizeof(p-td.td_link),
CVS commit: src/usr.sbin/makefs/ffs
Module Name:src
Committed By: christos
Date: Wed Jan 30 17:29:05 UTC 2013
Modified Files:
src/usr.sbin/makefs/ffs: buf.c buf.h
Log Message:
buf is generic; it has nothing to do with ffs and will eventually be moved.
gc sectorize.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/makefs/ffs/buf.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/ffs/buf.h
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/makefs/ffs/buf.c
diff -u src/usr.sbin/makefs/ffs/buf.c:1.17 src/usr.sbin/makefs/ffs/buf.c:1.18
--- src/usr.sbin/makefs/ffs/buf.c:1.17 Mon Jan 28 16:03:29 2013
+++ src/usr.sbin/makefs/ffs/buf.c Wed Jan 30 12:29:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.17 2013/01/28 21:03:29 christos Exp $ */
+/* $NetBSD: buf.c,v 1.18 2013/01/30 17:29:05 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: buf.c,v 1.17 2013/01/28 21:03:29 christos Exp $);
+__RCSID($NetBSD: buf.c,v 1.18 2013/01/30 17:29:05 christos Exp $);
#endif /* !__lint */
#include sys/param.h
@@ -55,14 +55,7 @@ __RCSID($NetBSD: buf.c,v 1.17 2013/01/2
#include util.h
#include makefs.h
-
-#include ufs/ufs/dinode.h
-#include ufs/ffs/fs.h
-
-#include ffs/buf.h
-#include ffs/ufs_inode.h
-
-extern int sectorsize; /* XXX: from ffs.c mkfs.c */
+#include buf.h
TAILQ_HEAD(buftailhead,buf) buftail;
@@ -72,15 +65,14 @@ bread(struct vnode *vp, daddr_t blkno, i
{
off_t offset;
ssize_t rv;
- struct fs *fs = vp-fs;
+ fsinfo_t *fs = vp-fs;
- assert (fs != NULL);
assert (bpp != NULL);
if (debug DEBUG_BUF_BREAD)
printf(bread: blkno %lld size %d\n, (long long)blkno, size);
*bpp = getblk(vp, blkno, size, 0, 0);
- offset = (*bpp)-b_blkno * sectorsize; /* XXX */
+ offset = (*bpp)-b_blkno * fs-sectorsize;
if (debug DEBUG_BUF_BREAD)
printf(bread: blkno %lld offset %lld bcount %ld\n,
(long long)(*bpp)-b_blkno, (long long) offset,
@@ -138,9 +130,10 @@ bwrite(struct buf *bp)
off_t offset;
ssize_t rv;
int bytes;
+ fsinfo_t *fs = bp-b_fs;
assert (bp != NULL);
- offset = bp-b_blkno * sectorsize; /* XXX */
+ offset = bp-b_blkno * fs-sectorsize;
bytes = bp-b_bcount;
if (debug DEBUG_BUF_BWRITE)
printf(bwrite: blkno %lld offset %lld bcount %d\n,
@@ -190,10 +183,7 @@ getblk(struct vnode *vp, daddr_t blkno,
static int buftailinitted;
struct buf *bp;
void *n;
- int fd = vp-fd;
- struct fs *fs = vp-fs;
- assert (fs != NULL);
if (debug DEBUG_BUF_GETBLK)
printf(getblk: blkno %lld size %d\n, (long long)blkno, size);
@@ -214,8 +204,8 @@ getblk(struct vnode *vp, daddr_t blkno,
bp = ecalloc(1, sizeof(*bp));
bp-b_bufsize = 0;
bp-b_blkno = bp-b_lblkno = blkno;
- bp-b_fd = fd;
- bp-b_fs = fs;
+ bp-b_fd = vp-fd;
+ bp-b_fs = vp-fs;
bp-b_data = NULL;
TAILQ_INSERT_HEAD(buftail, bp, b_tailq);
}
Index: src/usr.sbin/makefs/ffs/buf.h
diff -u src/usr.sbin/makefs/ffs/buf.h:1.7 src/usr.sbin/makefs/ffs/buf.h:1.8
--- src/usr.sbin/makefs/ffs/buf.h:1.7 Mon Jan 28 16:03:29 2013
+++ src/usr.sbin/makefs/ffs/buf.h Wed Jan 30 12:29:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.7 2013/01/28 21:03:29 christos Exp $ */
+/* $NetBSD: buf.h,v 1.8 2013/01/30 17:29:05 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@ struct buf {
daddr_t b_blkno;
daddr_t b_lblkno;
int b_fd;
- struct fs * b_fs;
+ void * b_fs;
TAILQ_ENTRY(buf) b_tailq;
};
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Wed Jan 30 17:29:25 UTC 2013
Modified Files:
src/usr.sbin/makefs: ffs.c msdos.c
Log Message:
gc global sectorsize.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/makefs/ffs.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/makefs/msdos.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/makefs/ffs.c
diff -u src/usr.sbin/makefs/ffs.c:1.57 src/usr.sbin/makefs/ffs.c:1.58
--- src/usr.sbin/makefs/ffs.c:1.57 Tue Jan 29 10:52:25 2013
+++ src/usr.sbin/makefs/ffs.c Wed Jan 30 12:29:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.57 2013/01/29 15:52:25 christos Exp $ */
+/* $NetBSD: ffs.c,v 1.58 2013/01/30 17:29:25 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: ffs.c,v 1.57 2013/01/29 15:52:25 christos Exp $);
+__RCSID($NetBSD: ffs.c,v 1.58 2013/01/30 17:29:25 christos Exp $);
#endif /* !__lint */
#include sys/param.h
@@ -149,9 +149,6 @@ static void *ffs_build_dinode2(struct u
-int sectorsize; /* XXX: for buf.c::getblk() */
-
-
/* publically visible functions */
void
ffs_prep_opts(fsinfo_t *fsopts)
@@ -421,8 +418,6 @@ ffs_validate(const char *dir, fsnode *ro
printf(ffs_validate: dir %s; %lld bytes, %lld inodes\n,
dir, (long long)fsopts-size, (long long)fsopts-inodes);
}
- sectorsize = fsopts-sectorsize; /* XXX - see earlier */
-
/* now check calculated sizes vs requested sizes */
if (fsopts-maxsize 0 fsopts-size fsopts-maxsize) {
errx(1, `%s' size of %lld is larger than the maxsize of %lld.,
Index: src/usr.sbin/makefs/msdos.c
diff -u src/usr.sbin/makefs/msdos.c:1.11 src/usr.sbin/makefs/msdos.c:1.12
--- src/usr.sbin/makefs/msdos.c:1.11 Tue Jan 29 16:54:19 2013
+++ src/usr.sbin/makefs/msdos.c Wed Jan 30 12:29:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msdos.c,v 1.11 2013/01/29 21:54:19 christos Exp $ */
+/* $NetBSD: msdos.c,v 1.12 2013/01/30 17:29:25 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: msdos.c,v 1.11 2013/01/29 21:54:19 christos Exp $);
+__RCSID($NetBSD: msdos.c,v 1.12 2013/01/30 17:29:25 christos Exp $);
#endif /* !__lint */
#include sys/param.h
@@ -63,8 +63,6 @@ __RCSID($NetBSD: msdos.c,v 1.11 2013/01
#include msdos.h
#include mkfs_msdos.h
-extern int sectorsize; /* XXX: horrid */
-
static int msdos_populate_dir(const char *, struct denode *, fsnode *,
fsnode *, fsinfo_t *);
@@ -151,7 +149,17 @@ msdos_makefs(const char *image, const ch
* Is minsize right here?
*/
msdos_opt-create_size = MAX(msdos_opt-create_size, fsopts-minsize);
- msdos_opt-bytes_per_sector = sectorsize = 512;
+ if (msdos_opt-bytes_per_sector == 0) {
+ if (fsopts-sectorsize == 0)
+ fsopts-sectorsize = 512;
+ msdos_opt-bytes_per_sector = fsopts-sectorsize;
+ } else if (fsopts-sectorsize == 0) {
+ fsopts-sectorsize = msdos_opt-bytes_per_sector;
+ } else if (fsopts-sectorsize != msdos_opt-bytes_per_sector) {
+ err(1, inconsistent sectorsize -S %u
+ != -o bytes_per_sector %u,
+ fsopts-sectorsize, msdos_opt-bytes_per_sector);
+ }
/* create image */
printf(Creating `%s'\n, image);
CVS commit: src/sys/dev/pci
Module Name:src Committed By: rkujawa Date: Wed Jan 30 19:08:53 UTC 2013 Modified Files: src/sys/dev/pci: files.pci Log Message: Include rasops that are actually needed by this driver. To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/sys/dev/pci/files.pci 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/files.pci diff -u src/sys/dev/pci/files.pci:1.362 src/sys/dev/pci/files.pci:1.363 --- src/sys/dev/pci/files.pci:1.362 Tue Jan 1 12:13:28 2013 +++ src/sys/dev/pci/files.pci Wed Jan 30 19:08:53 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.362 2013/01/01 12:13:28 macallan Exp $ +# $NetBSD: files.pci,v 1.363 2013/01/30 19:08:53 rkujawa Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -1125,6 +1125,6 @@ file dev/pci/lynxfb.c lynxfb needs-flag # 3Dfx Voodoo Graphics defflag opt_tdvfb.h TDVFB_CONSOLE -device tdvfb: wsemuldisplaydev, rasops8, vcons, videomode +device tdvfb: wsemuldisplaydev, rasops16, rasops32, vcons, videomode attach tdvfb at pci file dev/pci/tdvfb.c tdvfb
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Wed Jan 30 19:19:20 UTC 2013
Modified Files:
src/usr.sbin/makefs: ffs.c makefs.h msdos.c
src/usr.sbin/makefs/ffs: buf.c buf.h ffs_alloc.c ffs_balloc.c
ufs_inode.h
src/usr.sbin/makefs/msdos: msdosfs_vfsops.c
Log Message:
- don't abuse vp-fs to mean struct fs for ffs and struct msdos_opts;
make it always fsinfo_t and change void * to that.
- kill unused structure members.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/makefs/ffs.c
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/makefs/makefs.h
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/makefs/msdos.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/makefs/ffs/buf.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/ffs/buf.h
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/makefs/ffs/ffs_alloc.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/ffs/ffs_balloc.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makefs/ffs/ufs_inode.h
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makefs/msdos/msdosfs_vfsops.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/makefs/ffs.c
diff -u src/usr.sbin/makefs/ffs.c:1.58 src/usr.sbin/makefs/ffs.c:1.59
--- src/usr.sbin/makefs/ffs.c:1.58 Wed Jan 30 12:29:25 2013
+++ src/usr.sbin/makefs/ffs.c Wed Jan 30 14:19:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.58 2013/01/30 17:29:25 christos Exp $ */
+/* $NetBSD: ffs.c,v 1.59 2013/01/30 19:19:19 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: ffs.c,v 1.58 2013/01/30 17:29:25 christos Exp $);
+__RCSID($NetBSD: ffs.c,v 1.59 2013/01/30 19:19:19 christos Exp $);
#endif /* !__lint */
#include sys/param.h
@@ -853,6 +853,7 @@ ffs_write_file(union dinode *din, uint32
struct inode in;
struct buf * bp;
ffs_opt_t *ffs_opts = fsopts-fs_specific;
+ struct vnode vp = { fsopts, NULL };
assert (din != NULL);
assert (buf != NULL);
@@ -865,6 +866,7 @@ ffs_write_file(union dinode *din, uint32
p = NULL;
in.i_fs = (struct fs *)fsopts-superblock;
+ in.i_devvp = vp;
if (debug DEBUG_FS_WRITE_FILE) {
printf(
@@ -885,7 +887,6 @@ ffs_write_file(union dinode *din, uint32
else
memcpy(in.i_din.ffs2_din, din-ffs2_din,
sizeof(in.i_din.ffs2_din));
- in.i_fd = fsopts-fd;
if (DIP(din, size) == 0)
goto write_inode_and_leave; /* mmm, cheating */
Index: src/usr.sbin/makefs/makefs.h
diff -u src/usr.sbin/makefs/makefs.h:1.31 src/usr.sbin/makefs/makefs.h:1.32
--- src/usr.sbin/makefs/makefs.h:1.31 Tue Jan 29 10:52:25 2013
+++ src/usr.sbin/makefs/makefs.h Wed Jan 30 14:19:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: makefs.h,v 1.31 2013/01/29 15:52:25 christos Exp $ */
+/* $NetBSD: makefs.h,v 1.32 2013/01/30 19:19:19 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -141,7 +141,7 @@ typedef struct {
* the image, including current settings, global options, and fs
* specific options
*/
-typedef struct {
+typedef struct makefs_fsinfo {
/* current settings */
off_t size; /* total size */
off_t inodes; /* number of inodes */
Index: src/usr.sbin/makefs/msdos.c
diff -u src/usr.sbin/makefs/msdos.c:1.12 src/usr.sbin/makefs/msdos.c:1.13
--- src/usr.sbin/makefs/msdos.c:1.12 Wed Jan 30 12:29:25 2013
+++ src/usr.sbin/makefs/msdos.c Wed Jan 30 14:19:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msdos.c,v 1.12 2013/01/30 17:29:25 christos Exp $ */
+/* $NetBSD: msdos.c,v 1.13 2013/01/30 19:19:19 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: msdos.c,v 1.12 2013/01/30 17:29:25 christos Exp $);
+__RCSID($NetBSD: msdos.c,v 1.13 2013/01/30 19:19:19 christos Exp $);
#endif /* !__lint */
#include sys/param.h
@@ -150,10 +150,10 @@ msdos_makefs(const char *image, const ch
*/
msdos_opt-create_size = MAX(msdos_opt-create_size, fsopts-minsize);
if (msdos_opt-bytes_per_sector == 0) {
- if (fsopts-sectorsize == 0)
+ if (fsopts-sectorsize == -1)
fsopts-sectorsize = 512;
msdos_opt-bytes_per_sector = fsopts-sectorsize;
- } else if (fsopts-sectorsize == 0) {
+ } else if (fsopts-sectorsize == -1) {
fsopts-sectorsize = msdos_opt-bytes_per_sector;
} else if (fsopts-sectorsize != msdos_opt-bytes_per_sector) {
err(1, inconsistent sectorsize -S %u
@@ -168,8 +168,8 @@ msdos_makefs(const char *image, const ch
return;
TIMER_RESULTS(start, mkfs_msdos);
- vp.fd = open(image, O_RDWR);
- vp.fs = msdos_opt;
+ fsopts-fd = open(image, O_RDWR);
+ vp.fs = fsopts;
if ((pmp = msdosfs_mount(vp, 0)) == NULL)
err(1, msdosfs_mount);
Index: src/usr.sbin/makefs/ffs/buf.c
diff -u src/usr.sbin/makefs/ffs/buf.c:1.18 src/usr.sbin/makefs/ffs/buf.c:1.19
--- src/usr.sbin/makefs/ffs/buf.c:1.18 Wed Jan 30 12:29:05 2013
+++ src/usr.sbin/makefs/ffs/buf.c Wed Jan
CVS commit: src/distrib/notes/amiga
Module Name:src Committed By: rkujawa Date: Wed Jan 30 20:48:27 UTC 2013 Modified Files: src/distrib/notes/amiga: hardware Log Message: Note Mediator PCI 4000 support. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/distrib/notes/amiga/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/amiga/hardware diff -u src/distrib/notes/amiga/hardware:1.53 src/distrib/notes/amiga/hardware:1.54 --- src/distrib/notes/amiga/hardware:1.53 Mon Nov 19 23:04:15 2012 +++ src/distrib/notes/amiga/hardware Wed Jan 30 20:48:27 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: hardware,v 1.53 2012/11/19 23:04:15 rkujawa Exp $ +.\ $NetBSD: hardware,v 1.54 2013/01/30 20:48:27 rkujawa Exp $ . .Nx \*V runs on any Amiga that has a 68020 or better CPU with @@ -68,6 +68,8 @@ PCI bridges .(bullet -compact ELBOX Mediator PCI 1200 series (original model, LT2, LT4, SX, TX) .It +ELBOX Mediator PCI 4000 series (4000D, 4000Di, 3000D, 3/4000T, also Mk-II models) +.It Prometheus PCI bridge .It Phase5 PCI bridge: CyberVision PPC, BlizzardVision PPC
CVS commit: src/lib/libc/arch/arm/misc
Module Name:src
Committed By: matt
Date: Thu Jan 31 06:47:55 UTC 2013
Modified Files:
src/lib/libc/arch/arm/misc: arm_initfini.c
Log Message:
Reorganize to appease lint.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/arm/misc/arm_initfini.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/arm/misc/arm_initfini.c
diff -u src/lib/libc/arch/arm/misc/arm_initfini.c:1.1 src/lib/libc/arch/arm/misc/arm_initfini.c:1.2
--- src/lib/libc/arch/arm/misc/arm_initfini.c:1.1 Tue Jan 29 19:14:54 2013
+++ src/lib/libc/arch/arm/misc/arm_initfini.c Thu Jan 31 06:47:55 2013
@@ -29,7 +29,7 @@
#include sys/cdefs.h
-__RCSID($NetBSD: arm_initfini.c,v 1.1 2013/01/29 19:14:54 matt Exp $);
+__RCSID($NetBSD: arm_initfini.c,v 1.2 2013/01/31 06:47:55 matt Exp $);
/*
* To properly implement setjmp/longjmp for the ARM AAPCS ABI, it has to be
@@ -42,6 +42,7 @@ __RCSID($NetBSD: arm_initfini.c,v 1.1 2
#include sys/sysctl.h
#include stdbool.h
+#include stddef.h
int _libc_arm_fpu_present;
static bool _libc_aapcs_initialized;
@@ -51,11 +52,10 @@ void _libc_aapcs_init(void) __attribute_
void
_libc_aapcs_init(void)
{
- if (_libc_aapcs_initialized)
- return;
-
- _libc_aapcs_initialized = true;
- size_t len = sizeof(_libc_arm_fpu_present);
- (void)sysctlbyname(machdep.fpu_present, _libc_arm_fpu_present, len,
- NULL, 0);
+ if (!_libc_aapcs_initialized) {
+ size_t len = sizeof(_libc_arm_fpu_present);
+ _libc_aapcs_initialized = true;
+ (void)sysctlbyname(machdep.fpu_present,
+ _libc_arm_fpu_present, len, NULL, 0);
+ }
}
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src
Committed By: matt
Date: Thu Jan 31 06:52:16 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h
Log Message:
Define size_t, ptrdiff_t, and wchar_t to what NetBSD/arm wants instead of the
stupid values chosen for AAPCS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
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/gcc/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.2 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.2 Mon Aug 6 00:24:13 2012
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h Thu Jan 31 06:52:16 2013
@@ -20,13 +20,7 @@
/* Run-time Target Specification. */
#undef TARGET_VERSION
-#define TARGET_VERSION fputs ( (NetBSD/arm ELF EABI), stderr);
-
-/* Default to armv5t so that thumb shared libraries work.
- The ARM10TDMI core is the default for armv5t, so set
- SUBTARGET_CPU_DEFAULT to achieve this. */
-#undef SUBTARGET_CPU_DEFAULT
-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+#define TARGET_VERSION fputs ( (NetBSD/earm ELF), stderr);
/* This defaults us to little-endian. */
#ifndef TARGET_ENDIAN_DEFAULT
@@ -44,12 +38,6 @@
#undef MULTILIB_DEFAULTS
-/* Default it to use ATPCS with soft-VFP. */
-#undef TARGET_DEFAULT
-#define TARGET_DEFAULT \
- (MASK_APCS_FRAME \
- | TARGET_ENDIAN_DEFAULT)
-
#undef ARM_DEFAULT_ABI
#define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
@@ -57,7 +45,8 @@
#define TARGET_OS_CPP_BUILTINS() \
do \
{ \
- TARGET_BPABI_CPP_BUILTINS(); \
+ if (TARGET_AAPCS_BASED) \
+ TARGET_BPABI_CPP_BUILTINS(); \
NETBSD_OS_CPP_BUILTINS_ELF(); \
} \
while (0)
@@ -65,6 +54,18 @@
#undef SUBTARGET_CPP_SPEC
#define SUBTARGET_CPP_SPEC NETBSD_CPP_SPEC
+/*
+ * Override AAPCS types to remain compatible the existing NetBSD types.
+ */
+#undef WCHAR_TYPE
+#define WCHAR_TYPE int
+
+#undef SIZE_TYPE
+#define SIZE_TYPE long unsigned int
+
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE long int
+
#undef SUBTARGET_EXTRA_ASM_SPEC
#define SUBTARGET_EXTRA_ASM_SPEC \
-matpcs %{!mabi=*|mabi=aapcs*:-meabi=4} %{fpic|fpie:-k} %{fPIC|fPIE:-k}
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: matt
Date: Thu Jan 31 06:53:21 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
Cleanup arm--netbsdelf-*eabi*
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/dist/gcc/config.gcc
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/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.14 src/external/gpl3/gcc/dist/gcc/config.gcc:1.15
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.14 Thu Dec 20 07:12:26 2012
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Thu Jan 31 06:53:21 2013
@@ -724,11 +724,11 @@ arm*-*-freebsd*)
arm*-*-netbsdelf*)
tm_file=dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h
case ${target} in
- armeb*) tm_defines=${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_END ;;
+ armeb*) tm_defines=${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1 ;;
esac
tmake_file=${tmake_file} arm/t-arm
case ${target} in
- arm*-*-netbsdelf-*eabi)
+ arm*-*-netbsdelf-*eabi*)
tm_file=$tm_file arm/bpabi.h arm/netbsd-elf.h arm/netbsd-eabi.h
tmake_file=$tmake_file arm/t-arm-elf arm/t-bpabi
tmake_file=$tmake_file arm/t-netbsd-eabi
@@ -744,6 +744,11 @@ arm*-*-netbsdelf*)
tmake_file=$tmake_file arm/t-netbsd
;;
esac
+ case ${target} in
+ arm*-*-netbsdelf-*eabihf*)
+ tm_defines=${tm_defines} TARGET_DEFAULT_FLOAT_ABI=ARM_FLOAT_ABI_HARD
+ ;;
+ esac
;;
arm*-*-netbsd*)
tm_file=arm/aout.h arm/arm.h netbsd.h netbsd-aout.h arm/netbsd.h
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: matt Date: Thu Jan 31 07:11:08 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: t-netbsd t-netbsd-eabi Added Files: src/external/gpl3/gcc/dist/gcc/config/arm: unwind-netbsd.h Log Message: Add a unwind-netbsd.h which will include the proper unwind.h file depending on __ARM_EABI__. This allow gcc to build libgcc for both ABIs properly since they both different unwind.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h 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/gcc/dist/gcc/config/arm/t-netbsd diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.3 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.4 --- src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.3 Mon Jul 4 22:44:56 2011 +++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd Thu Jan 31 07:11:08 2013 @@ -23,6 +23,9 @@ TARGET_LIBGCC2_CFLAGS = -fomit-frame-poi LIBGCC2_DEBUG_CFLAGS = -g0 LIB2FUNCS_EXTRA = $(srcdir)/config/floatunsidf.c $(srcdir)/config/floatunsisf.c +# to make compat easier. +UNWIND_H = $(srcdir)/config/arm/unwind-netbsd.h + # This list is from t-arm-elf, but with some things removed. LIB1ASMFUNCS += _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \ _call_via_rX _interwork_call_via_rX \ Index: src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.2 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.3 --- src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi:1.2 Mon Aug 6 00:24:13 2012 +++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi Thu Jan 31 07:11:08 2013 @@ -33,3 +33,6 @@ LIB2FUNCS_EXTRA = $(srcdir)/config/arm/b # we don't have this LIB2FUNCS_STATIC_EXTRA = + +# to make compat easier. +UNWIND_H = $(srcdir)/config/arm/unwind-netbsd.h Added files: Index: src/external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h diff -u /dev/null src/external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h:1.1 --- /dev/null Thu Jan 31 07:11:09 2013 +++ src/external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h Thu Jan 31 07:11:08 2013 @@ -0,0 +1,34 @@ +/* Header file for the NetBSD ARM unwinder + Copyright (C) 2013 + Free Software Foundation, Inc. + Contributed by Matt Thomas + + This file is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3, or (at your option) any + later version. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + http://www.gnu.org/licenses/. */ + +#ifndef UNWIND_NETBSD_H +#define UNWIND_NETBSD_H + +#ifdef __ARM_EABI__ +#include unwind-arm.h +#else +#include unwind-generic.h +#endif /* defined __ARM_EABI__ */ + +#endif /* defined UNWIND_NETBSD_H */
