CVS commit: [matt-nb5-mips64] src/usr.bin/elf2ecoff

2009-12-11 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Dec 11 20:26:21 UTC 2009

Modified Files:
src/usr.bin/elf2ecoff [matt-nb5-mips64]: elf2ecoff.c

Log Message:
Use z format for size_t ...


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.32.1 src/usr.bin/elf2ecoff/elf2ecoff.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.bin/elf2ecoff/elf2ecoff.c
diff -u src/usr.bin/elf2ecoff/elf2ecoff.c:1.22 src/usr.bin/elf2ecoff/elf2ecoff.c:1.22.32.1
--- src/usr.bin/elf2ecoff/elf2ecoff.c:1.22	Wed May 31 08:09:55 2006
+++ src/usr.bin/elf2ecoff/elf2ecoff.c	Fri Dec 11 20:26:21 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: elf2ecoff.c,v 1.22 2006/05/31 08:09:55 simonb Exp $	*/
+/*	$NetBSD: elf2ecoff.c,v 1.22.32.1 2009/12/11 20:26:21 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Jonathan Stone
@@ -399,16 +399,16 @@
 	/* Write the headers... */
 	safewrite(outfile, &ep.f, sizeof(ep.f), "ep.f: write: %s\n");
 	if (debug)
-		fprintf(stderr, "wrote %d byte file header.\n", sizeof(ep.f));
+		fprintf(stderr, "wrote %zu byte file header.\n", sizeof(ep.f));
 
 	safewrite(outfile, &ep.a, sizeof(ep.a), "ep.a: write: %s\n");
 	if (debug)
-		fprintf(stderr, "wrote %d byte a.out header.\n", sizeof(ep.a));
+		fprintf(stderr, "wrote %zu byte a.out header.\n", sizeof(ep.a));
 
 	safewrite(outfile, &esecs, sizeof(esecs[0]) * nsecs,
 	"esecs: write: %s\n");
 	if (debug)
-		fprintf(stderr, "wrote %d bytes of section headers.\n",
+		fprintf(stderr, "wrote %zu bytes of section headers.\n",
 		sizeof(esecs[0]) * nsecs);
 
 
@@ -660,7 +660,7 @@
 	symhdrp->issExtMax = strsize;
 	if (debug)
 		fprintf(stderr,
-		"ECOFF symhdr: symhdr %x, strsize %lx, symsize %lx\n",
+		"ECOFF symhdr: symhdr %zx, strsize %lx, symsize %lx\n",
 		sizeof(*symhdrp), strsize,
 		(nesyms * sizeof(struct ecoff_extsym)));
 



CVS commit: [matt-nb5-mips64] src/usr.bin/elf2ecoff

2009-09-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  5 03:48:22 UTC 2009

Modified Files:
src/usr.bin/elf2ecoff [matt-nb5-mips64]: Makefile

Log Message:
Don't build if N64.


To generate a diff of this commit:
cvs rdiff -u -r1.10.46.1 -r1.10.46.2 src/usr.bin/elf2ecoff/Makefile

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

Modified files:

Index: src/usr.bin/elf2ecoff/Makefile
diff -u src/usr.bin/elf2ecoff/Makefile:1.10.46.1 src/usr.bin/elf2ecoff/Makefile:1.10.46.2
--- src/usr.bin/elf2ecoff/Makefile:1.10.46.1	Wed Aug 26 03:35:41 2009
+++ src/usr.bin/elf2ecoff/Makefile	Sat Sep  5 03:48:22 2009
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile,v 1.10.46.1 2009/08/26 03:35:41 matt Exp $
+#	$NetBSD: Makefile,v 1.10.46.2 2009/09/05 03:48:22 matt Exp $
 #	from: @(#)Makefile	5.4 (Berkeley) 5/11/90
 
 .include 
 
 # Build ELF to {ecoff, aout} tools on mips, for old bootblocks/PROMs.
 .if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
- ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb")
+ ((${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
+  ${CPUFLAGS:M-mabi=64} == ""))
 
 PROG=	elf2ecoff