From 410828e47a70317c39ef4ac1192d467a1cd0d48f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 12 Dec 2004 21:06:37 +0000 Subject: [PATCH] Update. 2004-12-12 Ulrich Drepper * elf/dl-load.c (_dl_map_object_from_fd): Fix computation of mapping start. It must take the actual pagesize into account, not the alignment in the file. --- ChangeLog | 6 ++++++ elf/dl-load.c | 4 ++-- linuxthreads/ChangeLog | 4 ++++ linuxthreads/internals.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0660ad3..1a02630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-12 Ulrich Drepper + + * elf/dl-load.c (_dl_map_object_from_fd): Fix computation of + mapping start. It must take the actual pagesize into account, not + the alignment in the file. + 2004-12-11 Ulrich Drepper * malloc/malloc.c (_int_realloc): Add checks for corrupted memory. diff --git a/elf/dl-load.c b/elf/dl-load.c index ea287cd..eb1a791 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -987,12 +987,12 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, } c = &loadcmds[nloadcmds++]; - c->mapstart = ph->p_vaddr & ~(ph->p_align - 1); + c->mapstart = ph->p_vaddr & ~(GLRO(dl_pagesize) - 1); c->mapend = ((ph->p_vaddr + ph->p_filesz + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1)); c->dataend = ph->p_vaddr + ph->p_filesz; c->allocend = ph->p_vaddr + ph->p_memsz; - c->mapoff = ph->p_offset & ~(ph->p_align - 1); + c->mapoff = ph->p_offset & ~(GLRO(dl_pagesize) - 1); /* Determine whether there is a gap between the last segment and this one. */ diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 261b5db..beaad8c 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2004-12-12 Ulrich Drepper + + * internals.h: Include to match includes used in nptl. + 2004-12-01 Jakub Jelinek #include +#include #include #include #include -- 2.7.4