PERFORCE change 31819 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=31819

Change 31819 by peter at peter_daintree on 2003/05/24 14:19:52

	IFC @31818

Affected files ...

.. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/exception.s#11 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#9 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#7 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#11 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/label.c#8 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#10 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#7 integrate

Differences ...

==== //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.32 2002/09/17 01:48:49 peter Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.33 2003/05/24 20:58:47 peter Exp $
 
 .include "../Makefile.inc"
 

==== //depot/projects/hammer/sys/ia64/ia64/exception.s#11 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/ia64/ia64/exception.s,v 1.44 2003/05/23 23:55:31 marcel Exp $
+ *	$FreeBSD: src/sys/ia64/ia64/exception.s,v 1.45 2003/05/24 20:51:55 marcel Exp $
  */
 
 #include <machine/asm.h>
@@ -522,7 +522,7 @@
 	// the backing store.
 {	.mmi
 	mov		ar.rsc=r31		// setup for loadrs
-(p15)	mov		ar.k7=r16
+	mov		ar.k7=r16
 (p15)	mov		r13=r29
 	;;
 }
@@ -542,7 +542,7 @@
 	;;
 }
 {	.mmb
-(p15)	mov		ar.k6=r31
+	mov		ar.k6=r31
 	mov		ar.rnat=r21
 	nop		0
 	;;

==== //depot/projects/hammer/usr.sbin/sysinstall/disks.c#9 (text+ko) ====

@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD: src/usr.sbin/sysinstall/disks.c,v 1.145 2002/12/05 22:10:39 jhb Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/disks.c,v 1.146 2003/05/24 21:12:13 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.

==== //depot/projects/hammer/usr.sbin/sysinstall/dist.c#7 (text+ko) ====

@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.221 2003/05/22 18:41:16 ru Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.222 2003/05/24 21:12:13 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.

==== //depot/projects/hammer/usr.sbin/sysinstall/install.c#11 (text+ko) ====

@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.342 2003/05/13 19:16:00 jhb Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.343 2003/05/24 21:12:13 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.

==== //depot/projects/hammer/usr.sbin/sysinstall/label.c#8 (text+ko) ====

@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $FreeBSD: src/usr.sbin/sysinstall/label.c,v 1.138 2003/04/21 20:57:20 rwatson Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/label.c,v 1.139 2003/05/24 21:12:14 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.

==== //depot/projects/hammer/usr.sbin/sysinstall/menus.c#10 (text+ko) ====

@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.372 2003/05/22 18:41:16 ru Exp $";
+  "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.373 2003/05/24 21:12:14 peter Exp $";
 #endif
 
 #include "sysinstall.h"

==== //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#7 (text+ko) ====

@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.244 2003/04/20 14:08:05 rwatson Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.245 2003/05/24 21:12:14 peter Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.