From owner-p4-projects  Fri May 17  2:48:12 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 47E7C37B406; Fri, 17 May 2002 02:48:00 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 4220337B401
	for <perforce@freebsd.org>; Fri, 17 May 2002 02:47:59 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4H9lxf74691
	for perforce@freebsd.org; Fri, 17 May 2002 02:47:59 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Fri, 17 May 2002 02:47:59 -0700 (PDT)
Message-Id: <200205170947.g4H9lxf74691@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 11442 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11442

Change 11442 by peter@peter_overcee on 2002/05/17 02:47:29

	IFC @11441 (sync up libgcc/Makefile with cvs too)

Affected files ...

... //depot/projects/ia64/gnu/lib/libgcc/Makefile#12 integrate
... //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#5 integrate

Differences ...

==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#12 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.42 2002/05/17 04:18:33 obrien Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.43 2002/05/17 08:59:13 peter Exp $
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 

==== //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.13 2002/05/17 07:14:55 tjr Exp $";
+  "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.14 2002/05/17 08:54:32 tjr Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -423,9 +423,9 @@
 	}
 	if (fchar == 'd')
 		digits++;
-	asprintf(&hdfmt, "%lu/%lu \"%%%s%d%c \" \"\\n\"",
-	    16UL / (u_long)isize, (u_long)isize,
-	    (fchar == 'd' || fchar == 'u') ? "" : "0", digits, fchar);
+	asprintf(&hdfmt, "%lu/%lu \"%*s%%%s%d%c\" \"\\n\"",
+	    16UL / (u_long)isize, (u_long)isize, (int)(4 * isize - digits),
+	    "", (fchar == 'd' || fchar == 'u') ? "" : "0", digits, fchar);
 	if (hdfmt == NULL)
 		err(1, NULL);
 	odadd(hdfmt);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message