diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-08-25 15:19:00 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-08-25 15:19:00 +0000 |
| commit | ac5506822324b3734549fb5633166af3d5eb9365 (patch) | |
| tree | 6450383acf55c7aeb84986c40497439953c1b220 /ldso/ldso/ldso.c | |
| parent | 8e4a1b8a993e8323f39dbc8f66a14ed0319259ad (diff) | |
Patch from Stefan Allius:
Remove unused function parameter in ldso.
Remove echo option '-e' since it is not supported on Solaris.
Diffstat (limited to 'ldso/ldso/ldso.c')
| -rw-r--r-- | ldso/ldso/ldso.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |