Use ElfW(Off) rather than off_t for offsets within ELF files.

diff --git a/ChangeLog b/ChangeLog
index c7f355b..77b6827 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-02  Roland McGrath  <roland@hack.frob.com>
+
+       * elf/dl-load.c (_dl_map_object_from_fd: struct loadcmd):
+       Make 'mapoff' field ElfW(Off) rather than off_t.
+
 2012-10-02  Dmitry V. Levin  <ldv@altlinux.org>
 
        * nscd/Makefile: Remove nscd-cflags and all its users.

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 7bf0c12..ea31417 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1090,7 +1090,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
     struct loadcmd
       {
        ElfW(Addr) mapstart, mapend, dataend, allocend;
-       off_t mapoff;
+       ElfW(Off) mapoff;
        int prot;
       } loadcmds[l->l_phnum], *c;
     size_t nloadcmds = 0;
@@ -1347,7 +1347,7 @@ cannot allocate TLS data structures for initial thread");
          l->l_text_end = l->l_addr + c->mapend;
 
        if (l->l_phdr == 0
-           && (ElfW(Off)) c->mapoff <= header->e_phoff
+           && c->mapoff <= header->e_phoff
            && ((size_t) (c->mapend - c->mapstart + c->mapoff)
                >= header->e_phoff + header->e_phnum * sizeof (ElfW(Phdr))))
          /* Found the program header in this segment.  */