4 files changed, 18 insertions, 14 deletions

diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c
index 089dba4a9fad..eafe5e2a7af0 100644
--- a/gnu/usr.bin/ld/ld.c
+++ b/gnu/usr.bin/ld/ld.c
@@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c	6.10 (Berkeley) 5/22/91";
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- *	$Id: ld.c,v 1.44 1997/04/25 19:43:19 bde Exp $
+ *	$Id: ld.c,v 1.45 1997/05/13 10:23:46 dfr Exp $
  */
 
 /* Define how to initialize system-dependent header fields.  */
@@ -3495,8 +3495,8 @@ write_syms()
 					nl.n_type = sp->defined;
 				if (nl.n_type == (N_INDR|N_EXT) &&
 							sp->value != 0)
-					errx(1, "%s: N_INDR has value %#x",
-							demangle(sp->name), sp->value);
+					errx(1, "%s: N_INDR has value %#lx",
+						demangle(sp->name), sp->value);
 				nl.n_value = sp->value;
 				if (sp->def_lsp)
 				    bind = N_BIND(&sp->def_lsp->nzlist.nlist);
@@ -3596,7 +3596,7 @@ printf("writesym(#%d): %s, type %x\n", syms_written, demangle(sp->name), sp->def
 
 	if (symtab_offset + symtab_len != strtab_offset)
 		errx(1,
-		"internal error: inconsistent symbol table length: %d vs %s",
+		"internal error: inconsistent symbol table length: %d vs %d",
 		symtab_offset + symtab_len, strtab_offset);
 
 	if (fseek(outstream, strtab_offset, SEEK_SET) != 0)
diff --git a/gnu/usr.bin/ld/lib.c b/gnu/usr.bin/ld/lib.c
index 12819334ba85..1abd974164b9 100644
--- a/gnu/usr.bin/ld/lib.c
+++ b/gnu/usr.bin/ld/lib.c
@@ -30,7 +30,7 @@
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- * $Id$	- library routines
+ * $Id: lib.c,v 1.21 1997/02/22 15:46:22 peter Exp $	- library routines
  */
 
 #include <sys/param.h>
@@ -130,7 +130,7 @@ decode_library_subfile(fd, library_entry, subfile_offset, length_loc)
 	if (sscanf(hdr1.ar_size, "%d", &member_length) != 1)
 		errx(1, "%s: malformatted header of archive member: %.*s",
 			get_file_name(library_entry),
-			sizeof(hdr1.ar_name), hdr1.ar_name);
+			(int)sizeof(hdr1.ar_name), hdr1.ar_name);
 
 	subentry = (struct file_entry *) xmalloc(sizeof(struct file_entry));
 	bzero(subentry, sizeof(struct file_entry));
@@ -157,7 +157,7 @@ decode_library_subfile(fd, library_entry, subfile_offset, length_loc)
 		if (read(fd, name, namelen) != namelen)
 			errx(1, "%s: malformatted archive member: %.*s",
 				get_file_name(library_entry),
-				sizeof(hdr1.ar_name), hdr1.ar_name);
+				(int)sizeof(hdr1.ar_name), hdr1.ar_name);
 		name[namelen] = 0;
 		content_length -= namelen;
 		starting_offset += namelen;
diff --git a/gnu/usr.bin/ld/rrs.c b/gnu/usr.bin/ld/rrs.c
index 3502ee0649e4..85688048df47 100644
--- a/gnu/usr.bin/ld/rrs.c
+++ b/gnu/usr.bin/ld/rrs.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rrs.c,v 1.21 1997/04/25 15:26:12 jdp Exp $
+ *	$Id: rrs.c,v 1.22 1997/05/13 10:23:47 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -534,7 +534,7 @@ claim_rrs_internal_gotslot(entry, rp, lsp, addend)
 	if (lsp->gotslot_offset != -1) {
 		/* Already claimed */
 		if (*GOTP(lsp->gotslot_offset) != addend)
-			errx(1, "%s: gotslot at %#x is multiple valued",
+			errx(1, "%s: gotslot at %#lx is multiple valued",
 				get_file_name(entry), lsp->gotslot_offset);
 		return lsp->gotslot_offset;
 	}
diff --git a/gnu/usr.bin/ld/warnings.c b/gnu/usr.bin/ld/warnings.c
index 76df8f7f99b7..ceb303ae911e 100644
--- a/gnu/usr.bin/ld/warnings.c
+++ b/gnu/usr.bin/ld/warnings.c
@@ -30,7 +30,7 @@
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- * $Id$
+ * $Id: warnings.c,v 1.15 1997/02/22 15:46:27 peter Exp $
  */
 
 #include <sys/param.h>
@@ -185,10 +185,14 @@ describe_file_sections(entry, outfile)
 	if (entry->flags & (E_JUST_SYMS | E_DYNAMIC))
 		fprintf(outfile, " symbols only\n");
 	else
-		fprintf(outfile, " text %x(%lx), data %x(%lx), bss %x(%lx) hex\n",
-			entry->text_start_address, entry->header.a_text,
-			entry->data_start_address, entry->header.a_data,
-			entry->bss_start_address, entry->header.a_bss);
+		fprintf(outfile,
+			" text %x(%lx), data %x(%lx), bss %x(%lx) hex\n",
+			entry->text_start_address,
+			(unsigned long)entry->header.a_text,
+			entry->data_start_address,
+			(unsigned long)entry->header.a_data,
+			entry->bss_start_address,
+			(unsigned long)entry->header.a_bss);
 }
 
 static void