Merge changes from mainline to make elf64-alpha build again

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2fc0258636cb1b4bf1932876796e1790ecd7583f..0ed7410bbf1ba7d7801e987b3c1830ebaa7ff480 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-23  Philip Blundell  <pb@futuretv.com>
+
+       From 2000-05-23  H.J. Lu  <hjl@gnu.org>
+       * elf64-alpha.c (elf64_alpha_relocate_section): Check
+       h->root.other not h->other.
+       * elf32-mips.c (mips_elf_calculate_relocation): Likewise.
+
 2000-10-23  Philip Blundell  <pb@futuretv.com>
 
        * elf32-arm.h (elf32_arm_finish_dynamic_symbol): Undo previous

diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 6306f108365b55ac8c7efd4bd4b3c3a123378577..e7e1c2a7ab20feca13e041779434a1b9e95a8ca6 100644 (file)
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -5931,7 +5931,7 @@ mips_elf_calculate_relocation (abfd,
           addresses.  */
        symbol = 0;
       else if (info->shared && !info->symbolic && !info->no_undefined
-              && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+              && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
        symbol = 0;
       else if (strcmp (h->root.root.root.string, "_DYNAMIC_LINK") == 0)
        {
@@ -5950,7 +5950,7 @@ mips_elf_calculate_relocation (abfd,
                 (info, h->root.root.root.string, input_bfd,
                  input_section, relocation->r_offset,
                  (!info->shared || info->no_undefined
-                  || ELF_ST_VISIBILITY (h->other)))))
+                  || ELF_ST_VISIBILITY (h->root.other)))))
            return bfd_reloc_undefined;
          symbol = 0;
        }

diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index c8fac5361ec9b60bec03392010cfef3d084867b4..4c083fa494488983f5a8806938b5ef80b8985c19 100644 (file)
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -3477,7 +3477,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
            relocation = 0;
          else if (info->shared && !info->symbolic
                   && !info->no_undefined
-                  && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
+                  && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
            relocation = 0;
          else
            {
@@ -3485,7 +3485,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                    (info, h->root.root.root.string, input_bfd,
                     input_section, rel->r_offset,
                     (!info->shared || info->no_undefined
-                     || ELF_ST_VISIBILITY (h->other)))))
+                     || ELF_ST_VISIBILITY (h->root.other)))))
                return false;
              relocation = 0;
            }