From d3fda8f182319ac08c855a15a7a5369d1714ea44 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 8 May 2001 17:08:03 +0000 Subject: Some very minor cleanups --- ldso/ldso/i386/dl-sysdep.h | 4 ++-- ldso/ldso/i386/elfinterp.c | 5 +++-- ldso/ldso/i386/ld_sysdep.h | 4 ++-- ldso/ldso/i386/sysdep.h | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ldso/ldso/i386/dl-sysdep.h b/ldso/ldso/i386/dl-sysdep.h index d8e57a66c..8e7fb656b 100644 --- a/ldso/ldso/i386/dl-sysdep.h +++ b/ldso/ldso/i386/dl-sysdep.h @@ -25,8 +25,8 @@ */ #define INIT_GOT(GOT_BASE,MODULE) \ { \ - GOT_BASE[2] = (int) _dl_linux_resolve; \ - GOT_BASE[1] = (int) MODULE; \ + GOT_BASE[2] = (unsigned long) _dl_linux_resolve; \ + GOT_BASE[1] = (unsigned long) MODULE; \ } /* diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c index aa795d803..6ddf92f1c 100644 --- a/ldso/ldso/i386/elfinterp.c +++ b/ldso/ldso/i386/elfinterp.c @@ -305,8 +305,9 @@ int _dl_parse_copy_information(struct dyn_elf *xpnt, unsigned long rel_addr, _dl_symbol(strtab + symtab[symtab_index].st_name)) continue; - symbol_addr = (unsigned long) _dl_find_hash(strtab + symtab[symtab_index].st_name, - xpnt->next, (int) reloc_addr, NULL, 1); + symbol_addr = (unsigned long) _dl_find_hash(strtab + + symtab[symtab_index].st_name, xpnt->next, + (unsigned long) reloc_addr, NULL, 1); if (!symbol_addr) { _dl_fdprintf(2, "%s: can't resolve symbol '%s'\n", _dl_progname, strtab + symtab[symtab_index].st_name); diff --git a/ldso/ldso/i386/ld_sysdep.h b/ldso/ldso/i386/ld_sysdep.h index d8e57a66c..8e7fb656b 100644 --- a/ldso/ldso/i386/ld_sysdep.h +++ b/ldso/ldso/i386/ld_sysdep.h @@ -25,8 +25,8 @@ */ #define INIT_GOT(GOT_BASE,MODULE) \ { \ - GOT_BASE[2] = (int) _dl_linux_resolve; \ - GOT_BASE[1] = (int) MODULE; \ + GOT_BASE[2] = (unsigned long) _dl_linux_resolve; \ + GOT_BASE[1] = (unsigned long) MODULE; \ } /* diff --git a/ldso/ldso/i386/sysdep.h b/ldso/ldso/i386/sysdep.h index d8e57a66c..8e7fb656b 100644 --- a/ldso/ldso/i386/sysdep.h +++ b/ldso/ldso/i386/sysdep.h @@ -25,8 +25,8 @@ */ #define INIT_GOT(GOT_BASE,MODULE) \ { \ - GOT_BASE[2] = (int) _dl_linux_resolve; \ - GOT_BASE[1] = (int) MODULE; \ + GOT_BASE[2] = (unsigned long) _dl_linux_resolve; \ + GOT_BASE[1] = (unsigned long) MODULE; \ } /* -- cgit v1.2.3