[uClibc-cvs] CVS update of uClibc/ldso (include/dl-elf.h ldso/arm/elfinterp.c ldso/cris/elfinterp.c ldso/dl-elf.c ldso/frv/elfinterp.c ldso/i386/elfinterp.c ldso/ldso.c ldso/m68k/elfinterp.c ldso/mips/elfinterp.c ldso/powerpc/elfinterp.c ldso/sh/elfinterp.c ldso/sh64/elfinterp.c ldso/sparc/elfinterp.c)
Joakim Tjernlund
jocke at codepoet.org
Wed Aug 25 15:19:01 UTC 2004
Date: Wednesday, August 25, 2004 @ 09:19:01
Author: jocke
Path: /var/cvs/uClibc/ldso
Modified: include/dl-elf.h (1.13 -> 1.14) ldso/arm/elfinterp.c (1.23 ->
1.24) ldso/cris/elfinterp.c (1.10 -> 1.11) ldso/dl-elf.c (1.77
-> 1.78) ldso/frv/elfinterp.c (1.3 -> 1.4) ldso/i386/elfinterp.c
(1.33 -> 1.34) ldso/ldso.c (1.111 -> 1.112)
ldso/m68k/elfinterp.c (1.18 -> 1.19) ldso/mips/elfinterp.c (1.17
-> 1.18) ldso/powerpc/elfinterp.c (1.41 -> 1.42)
ldso/sh/elfinterp.c (1.11 -> 1.12) ldso/sh64/elfinterp.c (1.5 ->
1.6) ldso/sparc/elfinterp.c (1.18 -> 1.19)
Patch from Stefan Allius:
Remove unused function parameter in ldso.
Remove echo option '-e' since it is not supported on Solaris.
Index: uClibc/ldso/include/dl-elf.h
diff -u uClibc/ldso/include/dl-elf.h:1.13 uClibc/ldso/include/dl-elf.h:1.14
--- uClibc/ldso/include/dl-elf.h:1.13 Sun Jun 20 05:10:49 2004
+++ uClibc/ldso/include/dl-elf.h Wed Aug 25 09:18:55 2004
@@ -59,11 +59,11 @@
/* Function prototypes for non-static stuff in readelflib1.c */
extern int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type);
+ unsigned long rel_addr, unsigned long rel_size);
extern void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type);
+ unsigned long rel_addr, unsigned long rel_size);
extern int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type);
+ unsigned long rel_addr, unsigned long rel_size);
extern struct elf_resolve * _dl_load_shared_library(int secure,
struct dyn_elf **rpnt, struct elf_resolve *tpnt, char *full_libname,
int trace_loaded_objects);
Index: uClibc/ldso/ldso/arm/elfinterp.c
diff -u uClibc/ldso/ldso/arm/elfinterp.c:1.23 uClibc/ldso/ldso/arm/elfinterp.c:1.24
--- uClibc/ldso/ldso/arm/elfinterp.c:1.23 Tue Aug 17 07:37:49 2004
+++ uClibc/ldso/ldso/arm/elfinterp.c Wed Aug 25 09:18:56 2004
@@ -443,19 +443,19 @@
}
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
(void)_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
}
int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->next, rel_addr, rel_size, _dl_do_copy_reloc);
}
Index: uClibc/ldso/ldso/cris/elfinterp.c
diff -u uClibc/ldso/ldso/cris/elfinterp.c:1.10 uClibc/ldso/ldso/cris/elfinterp.c:1.11
--- uClibc/ldso/ldso/cris/elfinterp.c:1.10 Tue Aug 17 07:37:50 2004
+++ uClibc/ldso/ldso/cris/elfinterp.c Wed Aug 25 09:18:57 2004
@@ -370,26 +370,20 @@
/* External interface to the generic part of the dynamic linker. */
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
- /* Keep the compiler happy. */
- (void) type;
(void)_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
- /* Keep the compiler happy. */
- (void) type;
return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
}
int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
- /* Keep the compiler happy. */
- (void) type;
return _dl_parse(rpnt->dyn, rpnt->next, rel_addr, rel_size, _dl_do_copy_reloc);
}
Index: uClibc/ldso/ldso/dl-elf.c
diff -u uClibc/ldso/ldso/dl-elf.c:1.77 uClibc/ldso/ldso/dl-elf.c:1.78
--- uClibc/ldso/ldso/dl-elf.c:1.77 Tue Aug 17 07:37:49 2004
+++ uClibc/ldso/ldso/dl-elf.c Wed Aug 25 09:18:56 2004
@@ -235,7 +235,7 @@
unsigned long _dl_internal_error_number;
struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
- struct elf_resolve *tpnt, char *full_libname, int trace_loaded_objects)
+ struct elf_resolve *tpnt, char *full_libname, int __attribute__((unused)) trace_loaded_objects)
{
char *pnt, *pnt1;
struct elf_resolve *tpnt1;
@@ -767,7 +767,7 @@
tpnt->init_flag |= RELOCS_DONE;
goof += _dl_parse_relocation_information(rpnt,
tpnt->dynamic_info[DT_RELOC_TABLE_ADDR],
- reloc_size, 0);
+ reloc_size);
}
if (tpnt->dynamic_info[DT_JMPREL] &&
(!(tpnt->init_flag & JMP_RELOCS_DONE) ||
@@ -777,11 +777,11 @@
if (!(tpnt->rtld_flags & RTLD_NOW)) {
_dl_parse_lazy_relocation_information(rpnt,
tpnt->dynamic_info[DT_JMPREL],
- tpnt->dynamic_info [DT_PLTRELSZ], 0);
+ tpnt->dynamic_info [DT_PLTRELSZ]);
} else {
goof += _dl_parse_relocation_information(rpnt,
tpnt->dynamic_info[DT_JMPREL],
- tpnt->dynamic_info[DT_PLTRELSZ], 0);
+ tpnt->dynamic_info[DT_PLTRELSZ]);
}
}
@@ -790,7 +790,7 @@
tpnt->init_flag |= COPY_RELOCS_DONE;
goof += _dl_parse_copy_information(rpnt,
tpnt->dynamic_info[DT_RELOC_TABLE_ADDR],
- tpnt->dynamic_info[DT_RELOC_TABLE_SIZE], 0);
+ tpnt->dynamic_info[DT_RELOC_TABLE_SIZE]);
#if defined (__SUPPORT_LD_DEBUG__)
if(_dl_debug) {
Index: uClibc/ldso/ldso/frv/elfinterp.c
diff -u uClibc/ldso/ldso/frv/elfinterp.c:1.3 uClibc/ldso/ldso/frv/elfinterp.c:1.4
--- uClibc/ldso/ldso/frv/elfinterp.c:1.3 Tue Aug 17 07:37:50 2004
+++ uClibc/ldso/ldso/frv/elfinterp.c Wed Aug 25 09:18:57 2004
@@ -424,16 +424,14 @@
void
_dl_parse_lazy_relocation_information
-(struct dyn_elf *rpnt, unsigned long rel_addr, unsigned long rel_size,
- int type __attribute_used__)
+(struct dyn_elf *rpnt, unsigned long rel_addr, unsigned long rel_size)
{
_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
}
int
_dl_parse_relocation_information
-(struct dyn_elf *rpnt, unsigned long rel_addr, unsigned long rel_size,
- int type __attribute_used__)
+(struct dyn_elf *rpnt, unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
}
@@ -444,8 +442,7 @@
_dl_parse_copy_information
(struct dyn_elf *rpnt __attribute_used__,
unsigned long rel_addr __attribute_used__,
- unsigned long rel_size __attribute_used__,
- int type __attribute_used__)
+ unsigned long rel_size __attribute_used__)
{
return 0;
}
Index: uClibc/ldso/ldso/i386/elfinterp.c
diff -u uClibc/ldso/ldso/i386/elfinterp.c:1.33 uClibc/ldso/ldso/i386/elfinterp.c:1.34
--- uClibc/ldso/ldso/i386/elfinterp.c:1.33 Tue Aug 17 07:37:51 2004
+++ uClibc/ldso/ldso/i386/elfinterp.c Wed Aug 25 09:18:58 2004
@@ -383,19 +383,19 @@
}
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
(void)_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
}
int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->next, rel_addr, rel_size, _dl_do_copy_reloc);
}
Index: uClibc/ldso/ldso/ldso.c
diff -u uClibc/ldso/ldso/ldso.c:1.111 uClibc/ldso/ldso/ldso.c:1.112
--- uClibc/ldso/ldso/ldso.c:1.111 Wed Aug 25 08:22:04 2004
+++ uClibc/ldso/ldso/ldso.c Wed Aug 25 09:18:56 2004
@@ -109,7 +109,7 @@
#endif
/* Store the page size for later use */
- _dl_pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? auxvt[AT_PAGESZ].a_un.a_val : PAGE_SIZE;
+ _dl_pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? (size_t) auxvt[AT_PAGESZ].a_un.a_val : PAGE_SIZE;
/* Make it so _dl_malloc can use the page of memory we have already
* allocated. We shouldn't need to grab any more memory. This must
* be first since things like _dl_dprintf() use _dl_malloc().... */
@@ -836,7 +836,7 @@
if (_dl_malloc_function)
return (*_dl_malloc_function) (size);
- if (_dl_malloc_addr - _dl_mmap_zero + size > _dl_pagesize) {
+ if (_dl_malloc_addr - _dl_mmap_zero + (unsigned)size > _dl_pagesize) {
#ifdef __SUPPORT_LD_DEBUG_EARLY__
_dl_dprintf(2, "malloc: mmapping more memory\n");
#endif
Index: uClibc/ldso/ldso/m68k/elfinterp.c
diff -u uClibc/ldso/ldso/m68k/elfinterp.c:1.18 uClibc/ldso/ldso/m68k/elfinterp.c:1.19
--- uClibc/ldso/ldso/m68k/elfinterp.c:1.18 Tue Aug 17 07:37:51 2004
+++ uClibc/ldso/ldso/m68k/elfinterp.c Wed Aug 25 09:18:58 2004
@@ -127,7 +127,7 @@
}
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
int i;
char *strtab;
@@ -173,7 +173,7 @@
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
int i;
char *strtab;
@@ -290,7 +290,7 @@
at all. */
int _dl_parse_copy_information(struct dyn_elf *xpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
int i;
char *strtab;
Index: uClibc/ldso/ldso/mips/elfinterp.c
diff -u uClibc/ldso/ldso/mips/elfinterp.c:1.17 uClibc/ldso/ldso/mips/elfinterp.c:1.18
--- uClibc/ldso/ldso/mips/elfinterp.c:1.17 Tue Aug 17 07:37:52 2004
+++ uClibc/ldso/ldso/mips/elfinterp.c Wed Aug 25 09:18:59 2004
@@ -158,14 +158,14 @@
}
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
/* Nothing to do */
return;
}
int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
/* Nothing to do */
return 0;
@@ -173,7 +173,7 @@
int _dl_parse_relocation_information(struct dyn_elf *xpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
Elf32_Sym *symtab;
Elf32_Rel *rpnt;
Index: uClibc/ldso/ldso/powerpc/elfinterp.c
diff -u uClibc/ldso/ldso/powerpc/elfinterp.c:1.41 uClibc/ldso/ldso/powerpc/elfinterp.c:1.42
--- uClibc/ldso/ldso/powerpc/elfinterp.c:1.41 Tue Aug 17 07:37:52 2004
+++ uClibc/ldso/ldso/powerpc/elfinterp.c Wed Aug 25 09:18:59 2004
@@ -388,12 +388,11 @@
}
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
struct elf_resolve *tpnt = rpnt->dyn;
Elf32_Word *plt, offset, i, num_plt_entries, rel_offset_words;
- (void) type;
num_plt_entries = rel_size / sizeof(ELF_RELOC);
rel_offset_words = PLT_DATA_START_WORDS(num_plt_entries);
@@ -485,14 +484,14 @@
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt, rel_addr, rel_size, _dl_do_reloc);
}
/* Should be a static inline instead, but that conflicts with ld_elf.h */
int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
/* Not used! */
return 0;
Index: uClibc/ldso/ldso/sh/elfinterp.c
diff -u uClibc/ldso/ldso/sh/elfinterp.c:1.11 uClibc/ldso/ldso/sh/elfinterp.c:1.12
--- uClibc/ldso/ldso/sh/elfinterp.c:1.11 Tue Aug 17 07:37:53 2004
+++ uClibc/ldso/ldso/sh/elfinterp.c Wed Aug 25 09:19:00 2004
@@ -390,19 +390,19 @@
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
(void)_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
}
int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->next, rel_addr, rel_size, _dl_do_copy_reloc);
}
Index: uClibc/ldso/ldso/sh64/elfinterp.c
diff -u uClibc/ldso/ldso/sh64/elfinterp.c:1.5 uClibc/ldso/ldso/sh64/elfinterp.c:1.6
--- uClibc/ldso/ldso/sh64/elfinterp.c:1.5 Tue Aug 17 07:37:53 2004
+++ uClibc/ldso/ldso/sh64/elfinterp.c Wed Aug 25 09:19:00 2004
@@ -501,19 +501,19 @@
}
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
(void)_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
}
int _dl_parse_copy_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->next, rel_addr, rel_size, _dl_do_copy_reloc);
}
Index: uClibc/ldso/ldso/sparc/elfinterp.c
diff -u uClibc/ldso/ldso/sparc/elfinterp.c:1.18 uClibc/ldso/ldso/sparc/elfinterp.c:1.19
--- uClibc/ldso/ldso/sparc/elfinterp.c:1.18 Tue Aug 17 07:37:54 2004
+++ uClibc/ldso/ldso/sparc/elfinterp.c Wed Aug 25 09:19:00 2004
@@ -147,7 +147,7 @@
}
void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
int i;
char * strtab;
@@ -187,7 +187,7 @@
}
int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
int i;
char * strtab;
@@ -297,7 +297,7 @@
at all */
int _dl_parse_copy_information(struct dyn_elf *xpnt,
- unsigned long rel_addr, unsigned long rel_size, int type)
+ unsigned long rel_addr, unsigned long rel_size)
{
int i;
char * strtab;
More information about the uClibc-cvs
mailing list