Update.

2003-02-12  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/mips/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Fix
	masking of version index.
	Patch by Lance Larsh <Lance.Larsh@oracle.com>.

diff --git a/ChangeLog b/ChangeLog
index 90142cd..b719c35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/mips/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Fix
+       masking of version index.
+       Patch by Lance Larsh <Lance.Larsh@oracle.com>.
+
 2003-02-11  Ulrich Drepper  <drepper@redhat.com>
 
        * nss/nss_files/files-hosts.c (HOST_DB_LOOKUP): Compute alignment

diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index 08e5a6e..c4864c2 100644 (file)
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  MIPS version.
-   Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
 
@@ -293,7 +293,7 @@ __dl_runtime_resolve (ElfW(Word) sym_index,                               \
          {                                                                   \
            const ElfW(Half) *vernum =                                        \
              (const void *) D_PTR (l, l_info[VERSYMIDX (DT_VERSYM)]);        \
-           ElfW(Half) ndx = vernum[sym_index & 0x7fff];                      \
+           ElfW(Half) ndx = vernum[sym_index] & 0x7fff;                      \
            const struct r_found_version *version = &l->l_versions[ndx];      \
                                                                              \
            if (version->hash != 0)                                           \