From owner-p4-projects@FreeBSD.ORG Sat May 24 14:19:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D98037B404; Sat, 24 May 2003 14:19:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16F7E37B401 for ; Sat, 24 May 2003 14:19:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE9643F3F for ; Sat, 24 May 2003 14:19:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4OLJs0U005882 for ; Sat, 24 May 2003 14:19:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4OLJsVj005879 for perforce@freebsd.org; Sat, 24 May 2003 14:19:54 -0700 (PDT) Date: Sat, 24 May 2003 14:19:54 -0700 (PDT) Message-Id: <200305242119.h4OLJsVj005879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 31819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2003 21:19:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=31819 Change 31819 by peter@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 @@ -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.