summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
Diffstat (limited to 'ldso')
-rw-r--r--ldso/include/dl-elf.h6
-rw-r--r--ldso/ldso/arm/elfinterp.c6
-rw-r--r--ldso/ldso/cris/elfinterp.c12
-rw-r--r--ldso/ldso/dl-elf.c10
-rw-r--r--ldso/ldso/frv/elfinterp.c9
-rw-r--r--ldso/ldso/i386/elfinterp.c6
-rw-r--r--ldso/ldso/ldso.c4
-rw-r--r--ldso/ldso/m68k/elfinterp.c6
-rw-r--r--ldso/ldso/mips/elfinterp.c6
-rw-r--r--ldso/ldso/powerpc/elfinterp.c7
-rw-r--r--ldso/ldso/sh/elfinterp.c6
-rw-r--r--ldso/ldso/sh64/elfinterp.c6
-rw-r--r--ldso/ldso/sparc/elfinterp.c6
13 files changed, 40 insertions, 50 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
index 28f98dccb..f1213d1b3 100644
--- a/ldso/include/dl-elf.h
+++ b/ldso/include/dl-elf.h
@@ -59,11 +59,11 @@ static inline void _dl_unmap_cache(void) { }
/* 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);
diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index ab66eed1a..cdf099d1f 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -443,19 +443,19 @@ _dl_do_copy_reloc (struct elf_resolve *tpnt, struct dyn_elf *scope,
}
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);
}
diff --git a/ldso/ldso/cris/elfinterp.c b/ldso/ldso/cris/elfinterp.c
index 6030a6575..0a8835c85 100644
--- a/ldso/ldso/cris/elfinterp.c
+++ b/ldso/ldso/cris/elfinterp.c
@@ -370,26 +370,20 @@ _dl_do_copy_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope, ELF_RELOC *rp
/* 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);
}
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 8af9e78f6..e11cb0d92 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -235,7 +235,7 @@ unsigned long _dl_error_number;
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 @@ int _dl_fixup(struct dyn_elf *rpnt, int now_flag)
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 @@ int _dl_fixup(struct dyn_elf *rpnt, int now_flag)
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 @@ int _dl_fixup(struct dyn_elf *rpnt, int now_flag)
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) {
diff --git a/ldso/ldso/frv/elfinterp.c b/ldso/ldso/frv/elfinterp.c
index 7e61763ae..dabd84a56 100644
--- a/ldso/ldso/frv/elfinterp.c
+++ b/ldso/ldso/frv/elfinterp.c
@@ -424,16 +424,14 @@ _dl_do_lazy_reloc (struct elf_resolve *tpnt,
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 @@ int
_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;
}
diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index 4cb9047be..9678de93b 100644
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -383,19 +383,19 @@ _dl_do_copy_reloc (struct elf_resolve *tpnt, struct dyn_elf *scope,
}
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);
}
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 8730da8a5..568081acd 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -109,7 +109,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr,
#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 @@ void *_dl_malloc(int size)
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
diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c
index 5e8249504..6e7ad6c5d 100644
--- a/ldso/ldso/m68k/elfinterp.c
+++ b/ldso/ldso/m68k/elfinterp.c
@@ -127,7 +127,7 @@ unsigned int _dl_linux_resolver (int dummy1, int dummy2,
}
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 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
}
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 @@ int _dl_parse_relocation_information(struct dyn_elf *rpnt,
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;
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c
index 5457e6d7a..21bda6f96 100644
--- a/ldso/ldso/mips/elfinterp.c
+++ b/ldso/ldso/mips/elfinterp.c
@@ -158,14 +158,14 @@ unsigned long _dl_linux_resolver(unsigned long sym_index,
}
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_copy_information(struct dyn_elf *rpnt,
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;
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index 103a0fb56..0666012cb 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -388,12 +388,11 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
}
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 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
}
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;
diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c
index 3899b70b4..55c567d31 100644
--- a/ldso/ldso/sh/elfinterp.c
+++ b/ldso/ldso/sh/elfinterp.c
@@ -390,19 +390,19 @@ _dl_do_copy_reloc (struct elf_resolve *tpnt, struct dyn_elf *scope,
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);
}
diff --git a/ldso/ldso/sh64/elfinterp.c b/ldso/ldso/sh64/elfinterp.c
index 886349dd2..19d339ef7 100644
--- a/ldso/ldso/sh64/elfinterp.c
+++ b/ldso/ldso/sh64/elfinterp.c
@@ -501,19 +501,19 @@ static int _dl_do_copy_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
}
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);
}
diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c
index 44d889ff2..543489fc1 100644
--- a/ldso/ldso/sparc/elfinterp.c
+++ b/ldso/ldso/sparc/elfinterp.c
@@ -147,7 +147,7 @@ unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt)
}
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 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
}
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 @@ int _dl_parse_relocation_information(struct dyn_elf *rpnt,
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:48:08 +0000