Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / sysdeps / unix / sysv / linux / i386 / dl-librecon.h

diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h
index 3163c581030b8a7fcccfcb4ad881e4fe63c103bc..687ac3035938c0a3a45cf729f0eba3df86e92c3e 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h
+++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h
@@ -1,5 +1,5 @@
 /* Optional code to distinguish library flavours.
-   Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _DL_LIBRECON_H
 
@@ -28,15 +27,15 @@
       /* We have to find out whether the binary is linked against            \
         libc 5 or glibc.  We do this by looking at all the DT_NEEDED         \
         entries.  If one is libc.so.5 this is a libc 5 linked binary.  */    \
-      if (GL(dl_loaded)->l_info[DT_NEEDED])                                  \
+      if (main_map->l_info[DT_NEEDED])                                       \
        {                                                                     \
          /* We have dependencies.  */                                        \
          const ElfW(Dyn) *d;                                                 \
          const char *strtab;                                                 \
                                                                              \
-         strtab = (const char *) D_PTR (GL(dl_loaded), l_info[DT_STRTAB]);   \
+         strtab = (const char *) D_PTR (main_map, l_info[DT_STRTAB]);        \
                                                                              \
-         for (d = GL(dl_loaded)->l_ld; d->d_tag != DT_NULL; ++d)             \
+         for (d = main_map->l_ld; d->d_tag != DT_NULL; ++d)                  \
            if (d->d_tag == DT_NEEDED                                         \
                && strcmp (strtab + d->d_un.d_val, "libc.so.5") == 0)         \
              break;                                                          \
@@ -48,11 +47,10 @@
   while (0)
 
 /* Recognizing extra environment variables.  */
-#undef EXTRA_LD_ENVVARS
-#define EXTRA_LD_ENVVARS EXTRA_LD_ENVVARS_LINUX \
+#define EXTRA_LD_ENVVARS \
   case 15:                                                                   \
     if (memcmp (envline, "LIBRARY_VERSION", 15) == 0)                        \
-      GL(dl_correct_cache_id) = envline[16] == '5' ? 2 : 3;                  \
+      GLRO(dl_correct_cache_id) = envline[16] == '5' ? 2 : 3;                \
     break;                                                                   \
 
 /* Extra unsecure variables.  The names are all stuffed in a single