[src/netbsd-1-4]: src/libexec/ld.elf_so Apply patch (requested by he):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64c698addf58
branches:  netbsd-1-4
changeset: 471007:64c698addf58
user:      he <he%NetBSD.org@localhost>
date:      Wed Oct 11 19:52:39 2000 +0000

description:
Apply patch (requested by he):
  Print possible 64bit values with %ld and cast to u_long.

diffstat:

 libexec/ld.elf_so/reloc.c  |  6 +++---
 libexec/ld.elf_so/symbol.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 0cd2bf2a3e3a -r 64c698addf58 libexec/ld.elf_so/reloc.c
--- a/libexec/ld.elf_so/reloc.c Wed Oct 11 18:54:05 2000 +0000
+++ b/libexec/ld.elf_so/reloc.c Wed Oct 11 19:52:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: reloc.c,v 1.19 1999/03/13 20:00:14 christos Exp $       */
+/*     $NetBSD: reloc.c,v 1.19.2.1 2000/10/11 19:52:39 he Exp $         */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -352,9 +352,9 @@
                    (void *)rela->r_offset, (void *)rela->r_addend,
                    (void *)*where,
                    def ? defobj->strtab + def->st_name : "??"));
-               _rtld_error("%s: Unsupported relocation type %d"
+               _rtld_error("%s: Unsupported relocation type %ld"
                    "in non-PLT relocations\n",
-                   obj->path, ELF_R_TYPE(rela->r_info));
+                   obj->path, (u_long) ELF_R_TYPE(rela->r_info));
                return -1;
        }
        return 0;
diff -r 0cd2bf2a3e3a -r 64c698addf58 libexec/ld.elf_so/symbol.c
--- a/libexec/ld.elf_so/symbol.c        Wed Oct 11 18:54:05 2000 +0000
+++ b/libexec/ld.elf_so/symbol.c        Wed Oct 11 19:52:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: symbol.c,v 1.3 1999/03/01 16:40:08 christos Exp $       */
+/*     $NetBSD: symbol.c,v 1.3.2.1 2000/10/11 19:52:39 he Exp $         */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -170,9 +170,9 @@
 
        if (ELF_R_TYPE(r_info) != R_TYPE(NONE)) {
                _rtld_error(
-           "%s: Undefined %ssymbol \"%s\" (reloc type = %d, symnum = %d)",
+           "%s: Undefined %ssymbol \"%s\" (reloc type = %ld, symnum = %ld)",
                    refobj->path, in_plt ? "PLT " : "", name,
-                   ELF_R_TYPE(r_info), symnum);
+                   (u_long) ELF_R_TYPE(r_info), (u_long) symnum);
        }
        return NULL;
 }