* elflink.h (elf_link_add_archive_symbols): For the default

	version, check references with only one `@' first.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 02c0ef1887d3a80b44d7c4dfa27e3b21b2a5ffb0..23c68b198c11099296b5ee5e7d6f0c75d0b7ca11 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-23  H.J. Lu  <hjl@gnu.org>
+
+       * elflink.h (elf_link_add_archive_symbols): For the default
+       version, check references with only one `@' first.
+
 2002-06-23  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
        * elf64-hppa.c (elf64_hppa_mark_milli_and_exported_functions): New

diff --git a/bfd/elflink.h b/bfd/elflink.h
index 3cd9e0c49aa6a1b7e82687af472acda1fe5b450f..d4a26528a9e3b5d7bf3821f79b5aab9a844d9a3f 100644 (file)
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -353,26 +353,40 @@ elf_link_add_archive_symbols (abfd, info)
          if (h == NULL)
            {
              char *p, *copy;
+             size_t len, first;
 
              /* If this is a default version (the name contains @@),
-                look up the symbol again without the version.  The
-                effect is that references to the symbol without the
-                version will be matched by the default symbol in the
-                archive.  */
+                look up the symbol again with only one `@' as well
+                as without the version.  The effect is that references
+                to the symbol with and without the version will be
+                matched by the default symbol in the archive.  */
 
              p = strchr (symdef->name, ELF_VER_CHR);
              if (p == NULL || p[1] != ELF_VER_CHR)
                continue;
 
-             copy = bfd_alloc (abfd, (bfd_size_type) (p - symdef->name + 1));
+             /* First check with only one `@'.  */
+             len = strlen (symdef->name);
+             copy = bfd_alloc (abfd, (bfd_size_type) len);
              if (copy == NULL)
                goto error_return;
-             memcpy (copy, symdef->name, (size_t) (p - symdef->name));
-             copy[p - symdef->name] = '\0';
+             first = p - symdef->name + 1;
+             memcpy (copy, symdef->name, first);
+             memcpy (copy + first, symdef->name + first + 1, len - first);
 
              h = elf_link_hash_lookup (elf_hash_table (info), copy,
                                        false, false, false);
 
+             if (h == NULL)
+               {
+                 /* We also need to check references to the symbol
+                    without the version.  */
+
+                 copy[first - 1] = '\0';
+                 h = elf_link_hash_lookup (elf_hash_table (info),
+                                           copy, false, false, false);
+               }
+
              bfd_release (abfd, copy);
            }