fix gettext sanitization

[deliverable/binutils-gdb.git] / bfd / elflink.h

diff --git a/bfd/elflink.h b/bfd/elflink.h
index 711372d88cdbd0e79531a7ec82d6e31ac95fb0f7..db79db7e7b93a792a37d16713972c2732b192044 100644 (file)
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -1,5 +1,5 @@
 /* ELF linker support.
-   Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -1098,7 +1098,7 @@ elf_link_add_object_symbols (abfd, info)
       if (info->hash->creator->flavour == bfd_target_elf_flavour)
        {
          Elf_Internal_Versym iver;
-         int vernum;
+         unsigned int vernum = 0;
          boolean override;
 
          if (ever != NULL)
@@ -1123,7 +1123,7 @@ elf_link_add_object_symbols (abfd, info)
                      if (vernum > elf_tdata (abfd)->dynverdef_hdr.sh_info)
                        {
                          (*_bfd_error_handler)
-                           ("%s: %s: invalid version %d (max %d)",
+                           (_("%s: %s: invalid version %u (max %d)"),
                             abfd->filename, name, vernum,
                             elf_tdata (abfd)->dynverdef_hdr.sh_info);
                          bfd_set_error (bfd_error_bad_value);
@@ -1164,7 +1164,7 @@ elf_link_add_object_symbols (abfd, info)
                      if (verstr == NULL)
                        {
                          (*_bfd_error_handler)
-                           ("%s: %s: invalid needed version %d",
+                           (_("%s: %s: invalid needed version %d"),
                             abfd->filename, name, vernum);
                          bfd_set_error (bfd_error_bad_value);
                          goto error_return;
@@ -1277,7 +1277,7 @@ elf_link_add_object_symbols (abfd, info)
            {
              if (h->size != 0 && h->size != sym.st_size && ! size_change_ok)
                (*_bfd_error_handler)
-                 ("Warning: size of symbol `%s' changed from %lu to %lu in %s",
+                 (_("Warning: size of symbol `%s' changed from %lu to %lu in %s"),
                   name, (unsigned long) h->size, (unsigned long) sym.st_size,
                   bfd_get_filename (abfd));
 
@@ -1299,7 +1299,7 @@ elf_link_add_object_symbols (abfd, info)
                  && h->type != ELF_ST_TYPE (sym.st_info)
                  && ! type_change_ok)
                (*_bfd_error_handler)
-                 ("Warning: type of symbol `%s' changed from %d to %d in %s",
+                 (_("Warning: type of symbol `%s' changed from %d to %d in %s"),
                   name, h->type, ELF_ST_TYPE (sym.st_info),
                   bfd_get_filename (abfd));
 
@@ -1521,7 +1521,7 @@ elf_link_add_object_symbols (abfd, info)
                          don't expect to see the type of override we
                          do in the case above.  */
                      (*_bfd_error_handler)
-                       ("%s: warning: unexpected redefinition of `%s'",
+                       (_("%s: warning: unexpected redefinition of `%s'"),
                         bfd_get_filename (abfd), shortname);
                    }
                  else
@@ -2211,7 +2211,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
 
   *sinterpptr = NULL;
 
-  soname_indx = -1;
+  soname_indx = (bfd_size_type) -1;
 
   if (info->hash->creator->flavour != bfd_target_elf_flavour)
     return true;
@@ -2458,7 +2458,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
          def.vd_next = (sizeof (Elf_External_Verdef)
                         + sizeof (Elf_External_Verdaux));
 
-         if (soname_indx != -1)
+         if (soname_indx != (bfd_size_type) -1)
            {
              def.vd_hash = bfd_elf_hash ((const unsigned char *) soname);
              defaux.vda_name = soname_indx;
@@ -3217,7 +3217,7 @@ elf_link_assign_sym_version (h, data)
          /* We could not find the version for a symbol when
              generating a shared archive.  Return an error.  */
          (*_bfd_error_handler)
-           ("%s: undefined version name %s",
+           (_("%s: undefined versioned symbol name %s"),
             bfd_get_filename (sinfo->output_bfd), h->root.root.string);
          bfd_set_error (bfd_error_bad_value);
          sinfo->failed = true;
@@ -4731,6 +4731,7 @@ elf_link_input_bfd (finfo, input_bfd)
                      || (elf_bad_symtab (input_bfd)
                          && finfo->sections[r_symndx] == NULL))
                    {
+                     struct elf_link_hash_entry *rh;
                      long indx;
 
                      /* This is a reloc against a global symbol.  We
@@ -4741,13 +4742,18 @@ elf_link_input_bfd (finfo, input_bfd)
                         for this symbol.  The symbol index is then
                         set at the end of elf_bfd_final_link.  */
                      indx = r_symndx - extsymoff;
-                     *rel_hash = elf_sym_hashes (input_bfd)[indx];
+                     rh = elf_sym_hashes (input_bfd)[indx];
+                     while (rh->root.type == bfd_link_hash_indirect
+                            || rh->root.type == bfd_link_hash_warning)
+                       rh = (struct elf_link_hash_entry *) rh->root.u.i.link;
 
                      /* Setting the index to -2 tells
                         elf_link_output_extsym that this symbol is
                         used by a reloc.  */
-                     BFD_ASSERT ((*rel_hash)->indx < 0);
-                     (*rel_hash)->indx = -2;
+                     BFD_ASSERT (rh->indx < 0);
+                     rh->indx = -2;
+
+                     *rel_hash = rh;
 
                      continue;
                    }
@@ -5095,7 +5101,7 @@ elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
       /* Allocate a table to hold the local symbols if first time */
       if (!ptr)
        {
-         int num_symbols = elf_tdata (abfd)->symtab_hdr.sh_info;
+         unsigned int num_symbols = elf_tdata (abfd)->symtab_hdr.sh_info;
          register unsigned int i;
 
          ptr = (elf_linker_section_pointers_t **)