* elf/rtld.c (dl_main): Use the page size to find the map start.

diff --git a/ChangeLog b/ChangeLog
index 92e1e5a..e6d92a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * elf/rtld.c (dl_main): Use the page size to find the map start.
+
 2007-11-05  Ulrich Drepper  <drepper@redhat.com>
 
        * time/tzfile.c (__tzfile_read): Fix check for version 0 data files.

diff --git a/elf/rtld.c b/elf/rtld.c
index 6df81fb..98817d9 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1166,7 +1166,8 @@ of this helper program; chances are you did not intend to run this program.\n\
          ElfW(Addr) allocend;
 
          /* Remember where the main program starts in memory.  */
-         mapstart = (main_map->l_addr + (ph->p_vaddr & ~(ph->p_align - 1)));
+         mapstart = (main_map->l_addr
+                     + (ph->p_vaddr & ~(GLRO(dl_pagesize) - 1)));
          if (main_map->l_map_start > mapstart)
            main_map->l_map_start = mapstart;
 

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6461785..c92e6ab 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-05  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/register-atfork.c (__register_atfork):
+       Use __linkin_atfork.
+
 2007-11-03  Mike Frysinger  <vapier@gentoo.org>
 
        * sysdeps/unix/sysv/linux/sh/lowlevellock.S (LOAD_FUTEX_WAIT): Add

diff --git a/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
index 71abd0f..bd10329 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/register-atfork.c
+++ b/nptl/sysdeps/unix/sysv/linux/register-atfork.c
@@ -98,8 +98,7 @@ __register_atfork (prepare, parent, child, dso_handle)
       newp->child_handler = child;
       newp->dso_handle = dso_handle;
 
-      newp->next = __fork_handlers;
-      __fork_handlers = newp;
+      __linkin_atfork (newp);
     }
 
   /* Release the lock.  */