* elflink.h (elf_link_input_bfd): Don't call reloc_emitter when

	reloc section size is zero.  Correct reloc output location.

	Merge from mainline.
	2002-07-14  H.J. Lu <hjl@gnu.org>
	* elflink.h (elf_link_assign_sym_version): Hide the default
	definition if there is a hidden versioned definition.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 37c6cde2130105fdda3efa1942c5002bc6ba315a..fe10170ee3f48dfbeb5f9907fb37f69784cb13b5 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+       * elflink.h (elf_link_input_bfd): Don't call reloc_emitter when
+       reloc section size is zero.  Correct reloc output location.
+
+       Merge from mainline.
+       2002-07-14  H.J. Lu <hjl@gnu.org>
+       * elflink.h (elf_link_assign_sym_version): Hide the default
+       definition if there is a hidden versioned definition.
+
 2002-07-16  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
        * elf-hppa.h (elf_hppa_reloc_final_type): Use R_PARISC_PCREL16F as

diff --git a/bfd/elflink.h b/bfd/elflink.h
index 57819e9958930554d87b7e45ae5ed824808d966b..8d2e1e6de3a2c3f32b1852ec5ce77e61cab56519 100644 (file)
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -4345,6 +4345,7 @@ elf_link_assign_sym_version (h, data)
            (_("%s: undefined versioned symbol name %s"),
             bfd_get_filename (sinfo->output_bfd), h->root.root.string);
          bfd_set_error (bfd_error_bad_value);
+error_return:
          sinfo->failed = true;
          return false;
        }
@@ -4416,6 +4417,43 @@ elf_link_assign_sym_version (h, data)
              (*bed->elf_backend_hide_symbol) (info, h, true);
            }
        }
+
+      /* We need to check if a hidden versioned definition should
+        hide the default one.  */
+      if (h->dynindx != -1 && h->verinfo.vertree != NULL)
+       {
+         const char *verstr, *name;
+         size_t namelen, verlen, newlen;
+         char *newname;
+         struct elf_link_hash_entry *newh;
+
+         name = h->root.root.string;
+         namelen = strlen (name);
+         verstr = h->verinfo.vertree->name;
+         verlen = strlen (verstr);
+         newlen = namelen + verlen + 2;
+
+         newname = (char *) bfd_malloc ((bfd_size_type) newlen);
+         if (newname == NULL)
+           goto error_return;
+         memcpy (newname, name, namelen);
+
+         /* Check the hidden versioned definition.  */
+         p = newname + namelen;
+         *p++ = ELF_VER_CHR;
+         memcpy (p, verstr, verlen + 1);
+         newh = elf_link_hash_lookup (elf_hash_table (info), newname,
+                                   false, false, false);
+
+         if (newh
+             && (newh->root.type == bfd_link_hash_defined
+                 || newh->root.type == bfd_link_hash_defweak))
+           /* We find a hidden versioned definition. Hide the default
+              one.  */
+           (*bed->elf_backend_hide_symbol) (info, h, true);
+
+         free (newname);
+       }
     }
 
   return true;
@@ -6907,7 +6945,7 @@ elf_link_input_bfd (finfo, input_bfd)
              Elf_Internal_Rela *irela;
              Elf_Internal_Rela *irelaend;
              struct elf_link_hash_entry **rel_hash;
-             Elf_Internal_Shdr *input_rel_hdr;
+             Elf_Internal_Shdr *input_rel_hdr, *input_rel_hdr2;
              unsigned int next_erel;
              boolean (*reloc_emitter) PARAMS ((bfd *, asection *,
                                                Elf_Internal_Shdr *,
@@ -7077,16 +7115,17 @@ elf_link_input_bfd (finfo, input_bfd)
              else
                reloc_emitter = elf_link_output_relocs;
 
-             if (! (*reloc_emitter) (output_bfd, o, input_rel_hdr,
-                                     internal_relocs))
+             if (input_rel_hdr->sh_size != 0
+                 && ! (*reloc_emitter) (output_bfd, o, input_rel_hdr,
+                                        internal_relocs))
                return false;
 
-             input_rel_hdr = elf_section_data (o)->rel_hdr2;
-             if (input_rel_hdr)
+             input_rel_hdr2 = elf_section_data (o)->rel_hdr2;
+             if (input_rel_hdr2 && input_rel_hdr2->sh_size != 0)
                {
                  internal_relocs += (NUM_SHDR_ENTRIES (input_rel_hdr)
                                      * bed->s->int_rels_per_ext_rel);
-                 if (! (*reloc_emitter) (output_bfd, o, input_rel_hdr,
+                 if (! (*reloc_emitter) (output_bfd, o, input_rel_hdr2,
                                          internal_relocs))
                    return false;
                }