From e849f8aab9a0c72062b9c4ce968da14b8ad121a7 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 23 Oct 2000 12:38:15 +0000 Subject: Merge changes from mainline to make elf64-alpha build again --- bfd/ChangeLog | 7 +++++++ bfd/elf32-mips.c | 4 ++-- bfd/elf64-alpha.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2fc0258636c..0ed7410bbf1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2000-10-23 Philip Blundell + + From 2000-05-23 H.J. Lu + * 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 * elf32-arm.h (elf32_arm_finish_dynamic_symbol): Undo previous diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index 6306f108365..e7e1c2a7ab2 100644 --- 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 c8fac5361ec..4c083fa4944 100644 --- 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; } -- cgit v1.2.1