[Glibc-bsd-commits] r3663 - branches/squeeze/glibc-ports/kfreebsd

[Petr Salinger]

Author: ps-guest
Date: 2011-08-01 08:27:14 +0000 (Mon, 01 Aug 2011)
New Revision: 3663

Modified:
   branches/squeeze/glibc-ports/kfreebsd/dl-sysdep.c
Log:
2.11 have slightly different internals


Modified: branches/squeeze/glibc-ports/kfreebsd/dl-sysdep.c
===================================================================
--- branches/squeeze/glibc-ports/kfreebsd/dl-sysdep.c	2011-08-01 07:20:45 UTC (rev 3662)
+++ branches/squeeze/glibc-ports/kfreebsd/dl-sysdep.c	2011-08-01 08:27:14 UTC (rev 3663)
@@ -39,7 +39,7 @@
 ElfW(Addr)
 _dl_sysdep_start (void **start_argptr,
 		  void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum,
-				   ElfW(Addr) *user_entry, ElfW(auxv_t) *auxv))
+				   ElfW(Addr) *user_entry))
 {
   const ElfW(Phdr) *phdr = NULL;
   ElfW(Word) phnum = 0;
@@ -119,14 +119,14 @@
   if (GLRO(dl_platform) != NULL)
     GLRO(dl_platformlen) = strlen (GLRO(dl_platform));
 
-  if (__sbrk (0) == _end)
+  if (__sbrk (0) == &_end)
     /* The dynamic linker was run as a program, and so the initial break
        starts just after our bss, at &_end.  The malloc in dl-minimal.c
        will consume the rest of this page, so tell the kernel to move the
        break up that far.  When the user program examines its break, it
        will see this new value and not clobber our data.  */
     __sbrk (GLRO(dl_pagesize)
-	    - ((_end - (char *) 0) & (GLRO(dl_pagesize) - 1)));
+	    - ((&_end - (void *) 0) & (GLRO(dl_pagesize) - 1)));
 
   /* If this is a SUID program we make sure that FDs 0, 1, and 2 are
      allocated.  If necessary we are doing it ourself.  If it is not
@@ -134,7 +134,7 @@
   if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
     __libc_check_standard_fds ();
 
-  (*dl_main) (phdr, phnum, &user_entry, _dl_auxv);
+  (*dl_main) (phdr, phnum, &user_entry);
   return user_entry;
 }