+2015-09-18 Carlos O'Donell <carlos@redhat.com>
+
+ * elf/dl-load.c: Include libc-internal.h.
+ (_dl_map_object_from_fd): Use ALIGN_UP and ALIGN_DOWN.
+
2015-09-18 Vincent Bernat <vincent@bernat.im>
[BZ #17887]
#include <caller.h>
#include <sysdep.h>
#include <stap-probe.h>
+#include <libc-internal.h>
#include <dl-dst.h>
#include <dl-load.h>
}
struct loadcmd *c = &loadcmds[nloadcmds++];
- 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->mapstart = ALIGN_DOWN (ph->p_vaddr, GLRO(dl_pagesize));
+ c->mapend = ALIGN_UP (ph->p_vaddr + ph->p_filesz, GLRO(dl_pagesize));
c->dataend = ph->p_vaddr + ph->p_filesz;
c->allocend = ph->p_vaddr + ph->p_memsz;
- c->mapoff = ph->p_offset & ~(GLRO(dl_pagesize) - 1);
+ c->mapoff = ALIGN_DOWN (ph->p_offset, GLRO(dl_pagesize));
/* Determine whether there is a gap between the last segment
and this one. */