CVS commit: src/distrib/sets/lists

2009-09-23 Thread Nicolas Joly
Module Name:src
Committed By:   njoly
Date:   Wed Sep 23 09:18:32 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/xbase: mi

Log Message:
Cleanup some duplicated entries.


To generate a diff of this commit:
cvs rdiff -u -r1.1312 -r1.1313 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.160 -r1.161 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/xbase/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1312 src/distrib/sets/lists/comp/mi:1.1313
--- src/distrib/sets/lists/comp/mi:1.1312	Thu Sep 17 08:55:19 2009
+++ src/distrib/sets/lists/comp/mi	Wed Sep 23 09:18:31 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1312 2009/09/17 08:55:19 sborrill Exp $
+#	$NetBSD: mi,v 1.1313 2009/09/23 09:18:31 njoly Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1277,8 +1277,6 @@
 ./usr/include/gssapi/gssapi_krb5.h		comp-krb5-include	kerberos
 ./usr/include/gssapi/gssapi_spnego.h		comp-krb5-include	kerberos
 ./usr/include/hesiod.hcomp-c-include
-./usr/include/dev/pci/hdaudio/hdaudioio.h	comp-c-include
-./usr/include/dev/pci/hdaudio/hdaudioreg.h	comp-c-include
 ./usr/include/histedit.h			comp-c-include
 ./usr/include/history.hcomp-obsolete		obsolete
 ./usr/include/iconv.hcomp-c-include
@@ -2336,7 +2334,6 @@
 ./usr/lib/libcrypto_mdc2_g.a			-unknown-		debuglib,crypto_mdc2
 ./usr/lib/libcrypto_mdc2_p.a			comp-c-proflib		profile,crypto_mdc2
 ./usr/lib/libcrypto_p.acomp-c-proflib		profile,crypto
-./usr/lib/libcrypto_p.acomp-c-proflib		profile,crypto
 ./usr/lib/libcrypto_rc5.a			comp-c-lib		crypto_rc5
 ./usr/lib/libcrypto_rc5_g.a			-unknown-		debuglib,crypto_rc5
 ./usr/lib/libcrypto_rc5_p.a			comp-c-proflib		profile,crypto_rc5

Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.160 src/distrib/sets/lists/misc/mi:1.161
--- src/distrib/sets/lists/misc/mi:1.160	Tue Jun 23 17:58:23 2009
+++ src/distrib/sets/lists/misc/mi	Wed Sep 23 09:18:32 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.160 2009/06/23 17:58:23 tron Exp $
+# $NetBSD: mi,v 1.161 2009/09/23 09:18:32 njoly Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -360,7 +360,6 @@
 ./usr/share/doc/html/postfix/postsuper.1.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/proxymap.8.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/qmgr.8.html	misc-postfix-htmldoc	postfix,doc
-./usr/share/doc/html/postfix/qmgr.8.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/qmqpd.8.html	misc-obsolete		obsolete
 ./usr/share/doc/html/postfix/qshape.1.html	misc-postfix-htmldoc	postfix,doc
 ./usr/share/doc/html/postfix/queuing.html	misc-obsolete		obsolete

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.79 src/distrib/sets/lists/xbase/mi:1.80
--- src/distrib/sets/lists/xbase/mi:1.79	Mon Sep  7 19:34:30 2009
+++ src/distrib/sets/lists/xbase/mi	Wed Sep 23 09:18:32 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.79 2009/09/07 19:34:30 mrg Exp $
+# $NetBSD: mi,v 1.80 2009/09/23 09:18:32 njoly Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -2298,7 +2298,6 @@
 ./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr/jp		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sharp			-obsolete-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/shift			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/shift			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/si			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sk			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sk_qwerty		-unknown-	obsolete



CVS commit: src/distrib/amd64/floppies/common

2009-09-23 Thread Nicolas Joly
Module Name:src
Committed By:   njoly
Date:   Wed Sep 23 11:17:59 UTC 2009

Modified Files:
src/distrib/amd64/floppies/common: boot.cfg

Log Message:
Update boot.cfg banner/menu to reflect that installation floppies have
ACPI support.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/floppies/common/boot.cfg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amd64/floppies/common/boot.cfg
diff -u src/distrib/amd64/floppies/common/boot.cfg:1.2 src/distrib/amd64/floppies/common/boot.cfg:1.3
--- src/distrib/amd64/floppies/common/boot.cfg:1.2	Sun Mar  8 05:39:19 2009
+++ src/distrib/amd64/floppies/common/boot.cfg	Wed Sep 23 11:17:58 2009
@@ -1,11 +1,11 @@
 banner=NetBSD floppy diskette installation
 banner
 banner=
-banner=These diskettes do not have support for ACPI and may not work on some
-banner=modern hardware.  If the floppy disk installation does not work, please
-banner=try installing using a CD-ROM image.
+banner=ACPI should work on all modern and legacy hardware, however if you have
+banner=problems, please try disabling it.
 banner=
 menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no SMP):boot netbsd -12
+menu=Install NetBSD (no ACPI):boot netbsd -2
+menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
 menu=Drop to boot prompt:prompt
 timeout=10



CVS commit: src/sys/arch/xen/xen

2009-09-23 Thread Manuel Bouyer
Module Name:src
Committed By:   bouyer
Date:   Wed Sep 23 17:48:55 UTC 2009

Modified Files:
src/sys/arch/xen/xen: xbd_xenbus.c xbdback_xenbus.c

Log Message:
xbdback: implement and publish feature-flush-cache.
xbd: if feature-flush-cache is present, use it for DIOCCACHESYNC.
 If not present, make DIOCCACHESYNC return EOPNOTSUPP and warn on
 first call.
Should improve WAPBL reliability of Xen guests on a NetBSD dom0.
Unfortunably not all linux guests seems to support this feature, and using
feature-write-barrier would require a B_BARRIER flag in the buffer.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/xen/xen/xbdback_xenbus.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/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.42 src/sys/arch/xen/xen/xbd_xenbus.c:1.43
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.42	Mon Sep 21 21:59:30 2009
+++ src/sys/arch/xen/xen/xbd_xenbus.c	Wed Sep 23 17:48:55 2009
@@ -1,4 +1,4 @@
-/*  $NetBSD: xbd_xenbus.c,v 1.42 2009/09/21 21:59:30 bouyer Exp $  */
+/*  $NetBSD: xbd_xenbus.c,v 1.43 2009/09/23 17:48:55 bouyer Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbd_xenbus.c,v 1.42 2009/09/21 21:59:30 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbd_xenbus.c,v 1.43 2009/09/23 17:48:55 bouyer Exp $);
 
 #include opt_xen.h
 #include rnd.h
@@ -84,11 +84,24 @@
 struct xbd_req {
 	SLIST_ENTRY(xbd_req) req_next;
 	uint16_t req_id; /* ID passed to backend */
-	grant_ref_t req_gntref[BLKIF_MAX_SEGMENTS_PER_REQUEST];
-	int req_nr_segments; /* number of segments in this request */
-	struct buf *req_bp; /* buffer associated with this request */
-	void *req_data; /* pointer to the data buffer */
+	union {
+	struct {
+		grant_ref_t req_gntref[BLKIF_MAX_SEGMENTS_PER_REQUEST];
+		int req_nr_segments; /* number of segments in this request */
+		struct buf *req_bp; /* buffer associated with this request */
+		void *req_data; /* pointer to the data buffer */
+	} req_rw;
+	struct {
+		int s_error;
+		volatile int s_done;
+	} req_sync;
+	} u;
 };
+#define req_gntref	u.req_rw.req_gntref
+#define req_nr_segments	u.req_rw.req_nr_segments
+#define req_bp		u.req_rw.req_bp
+#define req_data	u.req_rw.req_data
+#define req_sync	u.req_sync
 
 struct xbd_xenbus_softc {
 	device_t sc_dev;
@@ -104,6 +117,7 @@
 
 	struct xbd_req sc_reqs[XBD_RING_SIZE];
 	SLIST_HEAD(,xbd_req) sc_xbdreq_head; /* list of free requests */
+	bool sc_xbdreq_wait; /* special waiting on xbd_req */
 
 	int sc_backend_status; /* our status with backend */
 #define BLKIF_STATE_DISCONNECTED 0
@@ -119,6 +133,7 @@
 	uint64_t sc_xbdsize; /* size of disk in DEV_BSIZE */
 	u_long sc_info; /* VDISK_* */
 	u_long sc_handle; /* from backend */
+	int sc_cache_flush; /* backend supports BLKIF_OP_FLUSH_DISKCACHE */
 #if NRND  0
 	rndsource_element_t sc_rnd_source;
 #endif
@@ -518,6 +533,7 @@
 {
 	int err;
 	unsigned long long sectors;
+	u_long cache_flush;
 
 	err = xenbus_read_ul(NULL,
 	sc-sc_xbusd-xbusd_path, virtual-device, sc-sc_handle, 10);
@@ -541,6 +557,14 @@
 	if (err)
 		panic(%s: can't read number from %s/sector-size\n, 
 		device_xname(sc-sc_dev), sc-sc_xbusd-xbusd_otherend);
+	err = xenbus_read_ul(NULL, sc-sc_xbusd-xbusd_otherend,
+	feature-flush-cache, cache_flush, 10);
+	if (err)
+		cache_flush = 0;
+	if (cache_flush  0)
+		sc-sc_cache_flush = 1;
+	else
+		sc-sc_cache_flush = 0;
 
 	xenbus_switch_state(sc-sc_xbusd, NULL, XenbusStateConnected);
 }
@@ -564,9 +588,16 @@
 	for (i = sc-sc_ring.rsp_cons; i != resp_prod; i++) {
 		blkif_response_t *rep = RING_GET_RESPONSE(sc-sc_ring, i);
 		struct xbd_req *xbdreq = sc-sc_reqs[rep-id];
-		bp = xbdreq-req_bp;
 		DPRINTF((xbd_handler(%p): b_bcount = %ld\n,
-		bp, (long)bp-b_bcount));
+		xbdreq-req_bp, (long)bp-b_bcount));
+		bp = xbdreq-req_bp;
+		if (rep-operation == BLKIF_OP_FLUSH_DISKCACHE) {
+			xbdreq-req_sync.s_error = rep-status;
+			xbdreq-req_sync.s_done = 1;
+			wakeup(xbdreq);
+			/* caller will free the req */
+			continue;
+		}
 		for (seg = xbdreq-req_nr_segments - 1; seg = 0; seg--) {
 			if (__predict_false(
 			xengnt_status(xbdreq-req_gntref[seg]))) {
@@ -608,13 +639,15 @@
 		biodone(bp);
 		SLIST_INSERT_HEAD(sc-sc_xbdreq_head, xbdreq, req_next);
 	}
+done:
 	xen_rmb();
 	sc-sc_ring.rsp_cons = i;
 	RING_FINAL_CHECK_FOR_RESPONSES(sc-sc_ring, more_to_do);
 	if (more_to_do)
 		goto again;
-done:
 	dk_iodone(sc-sc_di, sc-sc_dksc);
+	if (sc-sc_xbdreq_wait)
+		wakeup(sc-sc_xbdreq_wait);
 	return 1;
 }
 
@@ -717,6 +750,10 @@
 	struct	dk_softc *dksc;
 	int	error;
 	struct	disk *dk;
+	int s;
+	struct xbd_req *xbdreq;
+	blkif_request_t *req;
+	int notify;
 
 	DPRINTF((xbdioctl(%d, %08lx, %p, %d, %p)\n,
 	dev, cmd, 

CVS commit: src/sys/dev/usb

2009-09-23 Thread Iain Hibbert
Module Name:src
Committed By:   plunky
Date:   Wed Sep 23 19:07:20 UTC 2009

Modified Files:
src/sys/dev/usb: if_atu.c if_aue.c if_axe.c if_cdce.c if_cue.c if_kue.c
if_rum.c if_udav.c if_upl.c if_ural.c if_url.c if_zyd.c moscom.c
pseye.c uaudio.c uberry.c ubsa.c ubt.c uchcom.c udsbr.c uep.c
uftdi.c ugen.c ugensa.c uhidev.c uhmodem.c uipaq.c uirda.c ulpt.c
umass.c umct.c umodem_common.c uplcom.c urio.c uscanner.c uslsa.c
usscanner.c ustir.c utoppy.c uvisor.c uvscom.c uyap.c
xboxcontroller.c

Log Message:
fix up USB drivers printing of autoconf information

1. expand the USB_ATTACH_SETUP macro (requested by jmcneill)

2. reorder the attach function so that the first thing it does is print
   newlines.

3. after this, we can call usbd_devinfo_alloc(), which polls the device
   allowing a context switch, and aprint_normal() the device information.

this avoids problems where autoconf messages are getting mixed up.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/if_atu.c src/sys/dev/usb/urio.c
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/if_kue.c \
src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/if_rum.c src/sys/dev/usb/umct.c \
src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_upl.c src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/if_ural.c src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/moscom.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/pseye.c src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/uchcom.c src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/udsbr.c \
src/sys/dev/usb/umodem_common.c src/sys/dev/usb/uyap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uep.c src/sys/dev/usb/utoppy.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/uftdi.c src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/ugensa.c src/sys/dev/usb/uvscom.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.133 -r1.134 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/xboxcontroller.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/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.32 src/sys/dev/usb/if_atu.c:1.33
--- src/sys/dev/usb/if_atu.c:1.32	Fri Sep  4 18:10:08 2009
+++ src/sys/dev/usb/if_atu.c	Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_atu.c,v 1.32 2009/09/04 18:10:08 dyoung Exp $ */
+/*	$NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $ */
 /*	$OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_atu.c,v 1.32 2009/09/04 18:10:08 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $);
 
 #include bpfilter.h
 
@@ -1182,9 +1182,10 @@
 	sc-atu_dev = self;
 	sc-sc_state = ATU_S_UNCONFIG;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_naive(\n);
 	aprint_normal(\n);
+
+	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, %s\n, devinfop);
 	usbd_devinfo_free(devinfop);
 
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.32 src/sys/dev/usb/urio.c:1.33
--- src/sys/dev/usb/urio.c:1.32	Tue Jan 20 18:20:48 2009
+++ src/sys/dev/usb/urio.c	Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: urio.c,v 1.32 2009/01/20 18:20:48 drochner Exp $	*/
+/*	$NetBSD: urio.c,v 1.33 2009/09/23 19:07:19 plunky Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: urio.c,v 1.32 2009/01/20 18:20:48 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: urio.c,v 1.33 2009/09/23 19:07:19 plunky Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -167,8 +167,10 @@
 
 	sc-sc_dev = self;
 
+	aprint_naive(\n);
+	aprint_normal(\n);
+
 	devinfop = usbd_devinfo_alloc(dev, 0);
-	USB_ATTACH_SETUP;
 	aprint_normal_dev(self, %s\n, devinfop);
 	usbd_devinfo_free(devinfop);
 

Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.114 

CVS commit: src/external/gpl3/binutils/usr.bin

2009-09-23 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Sep 23 19:41:24 UTC 2009

Modified Files:
src/external/gpl3/binutils/usr.bin: Makefile
src/external/gpl3/binutils/usr.bin/common: Makefile

Log Message:
Use the right variable to get VERSION from the defs.mk file.

Add a .WAIT to hopefully fix the problem reported by Patrick Welche on
current-users.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/usr.bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/usr.bin/common/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/gpl3/binutils/usr.bin/Makefile
diff -u src/external/gpl3/binutils/usr.bin/Makefile:1.2 src/external/gpl3/binutils/usr.bin/Makefile:1.3
--- src/external/gpl3/binutils/usr.bin/Makefile:1.2	Tue Sep  8 07:08:02 2009
+++ src/external/gpl3/binutils/usr.bin/Makefile	Wed Sep 23 19:41:24 2009
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.2 2009/09/08 07:08:02 skrll Exp $
+#	$NetBSD: Makefile,v 1.3 2009/09/23 19:41:24 skrll Exp $
 
 .include bsd.own.mk
 
 .if ${MKBINUTILS} != no  exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
 .include ${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk
 
-SSUBDIR+=	common gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt}
-SUBDIR+=	${SSUBDIR:O} # alphabetize
+SSUBDIR+=	gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt}
+SUBDIR+=	common .WAIT ${SSUBDIR:O} # alphabetize
 
 .endif	# MKBINUTILS != no
 

Index: src/external/gpl3/binutils/usr.bin/common/Makefile
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile:1.1 src/external/gpl3/binutils/usr.bin/common/Makefile:1.2
--- src/external/gpl3/binutils/usr.bin/common/Makefile:1.1	Tue Aug 18 20:22:08 2009
+++ src/external/gpl3/binutils/usr.bin/common/Makefile	Wed Sep 23 19:41:24 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/18 20:22:08 skrll Exp $
+#	$NetBSD: Makefile,v 1.2 2009/09/23 19:41:24 skrll Exp $
 
 .include bsd.own.mk
 
@@ -17,7 +17,7 @@
 bfdver.texi: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
 	${_MKTARGET_CREATE}
 	rm -f config.texi
-	(echo @set VERSION ${VERSION}; \
+	(echo @set VERSION ${G_VERSION}; \
 	if [ -n $(PKGVERSION) ]; then \
 		echo @set VERSION_PACKAGE $(PKGVERSION); \
 	fi)  ${.TARGET}



CVS commit: src/external/gpl3/binutils/dist/gas/doc

2009-09-23 Thread Valeriy E. Ushakov
Module Name:src
Committed By:   uwe
Date:   Wed Sep 23 19:53:30 UTC 2009

Modified Files:
src/external/gpl3/binutils/dist/gas/doc: c-mips.texi

Log Message:
Fix index entries that are intended to index .set singlefloat and
.set doublefloat, but were not edited after copy-paste.

I noticed this because compared to prebuilt as.info 1) on NetBSD index
entries are collated differently; 2) for some duplicate index entries
there are no additional foo n entries in the final output and (b/c
of #1 I guess) we pick a different one.

For the record, the other duplicate entry is in c-tic54x.texi where
both struct and union directive descriptions have:

  @cindex @code{tag} directive, TIC54X

Prebuilt file only lists the first occurence in the generated index
and we list only the second.

The MIPS false duplicate is easy to fix, but I'm too lazy to debug
makefino to figure out why the second, real duplicate is lost.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils/dist/gas/doc/c-mips.texi

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/binutils/dist/gas/doc/c-mips.texi
diff -u src/external/gpl3/binutils/dist/gas/doc/c-mips.texi:1.1.1.1 src/external/gpl3/binutils/dist/gas/doc/c-mips.texi:1.2
--- src/external/gpl3/binutils/dist/gas/doc/c-mips.texi:1.1.1.1	Tue Aug 18 09:36:00 2009
+++ src/external/gpl3/binutils/dist/gas/doc/c-mips.texi	Wed Sep 23 19:53:30 2009
@@ -606,8 +606,8 @@
 (@samp{-msoft-float} and @samp{-mhard-float}).
 
 @cindex Disable single-precision floating-point operations
-...@kindex @code{.set softfloat}
-...@kindex @code{.set hardfloat}
+...@kindex @code{.set singlefloat}
+...@kindex @code{.set doublefloat}
 The directives @code{.set singlefloat} and @code{.set doublefloat}
 provide finer control of disabling and enabling double-precision
 float-point operations.  These directives always override the default