[Glibc-bsd-commits] r4404 - trunk/glibc-ports/kfreebsd

[Aurelien Jarno]

Author: aurel32
Date: 2013-05-07 18:38:27 +0000 (Tue, 07 May 2013)
New Revision: 4404

Modified:
   trunk/glibc-ports/kfreebsd/dl-sysdep.c
Log:
Update dl-sysdep.c following upstream commit c7683a6d02f3ed59f5cd119b3e8547f45a15912f


Modified: trunk/glibc-ports/kfreebsd/dl-sysdep.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-sysdep.c	2013-05-01 15:59:26 UTC (rev 4403)
+++ trunk/glibc-ports/kfreebsd/dl-sysdep.c	2013-05-07 18:38:27 UTC (rev 4404)
@@ -55,12 +55,12 @@
 
   __libc_stack_end = DL_STACK_END (start_argptr);
   DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, INTUSE(_dl_argv), _environ,
-			  _dl_auxv);
+			  GLRO(dl_auxv));
 
   user_entry = (ElfW(Addr)) ENTRY_POINT;
   GLRO(dl_platform) = NULL; /* Default to nothing known about the platform.  */
 
-  for (av = _dl_auxv; av->a_type != AT_NULL; av++)
+  for (av = GLRO(dl_auxv); av->a_type != AT_NULL; av++)
     switch (av->a_type)
       {
       case AT_PHDR:
@@ -139,7 +139,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, GLRO(dl_auxv));
   return user_entry;
 }
 
@@ -158,7 +158,7 @@
      close by (otherwise the array will be too large).  In case we have
      to support a platform where these requirements are not fulfilled
      some alternative implementation has to be used.  */
-  for (av = _dl_auxv; av->a_type != AT_NULL; ++av)
+  for (av = GLRO(dl_auxv); av->a_type != AT_NULL; ++av)
     {
       static const struct
       {