From 0b3660a11ef418050c32664dd4a3d769c3f75887 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Tue, 10 Aug 1999 06:22:57 +0000 Subject: * elflink.h (elf_bfd_final_link): Tweak last change. --- bfd/elflink.h | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'bfd/elflink.h') diff --git a/bfd/elflink.h b/bfd/elflink.h index 7bd95d44786..c325c3e9c77 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -4016,12 +4016,27 @@ elf_bfd_final_link (abfd, info) = elf_section_data (o); struct bfd_elf_section_data *esdo = elf_section_data (output_section); + unsigned int *rel_count; + unsigned int *rel_count2; - esdo->rel_count += (esdi->rel_hdr.sh_size - / esdi->rel_hdr.sh_entsize); + /* We must be careful to add the relocation froms the + input section to the right output count. */ + if (esdi->rel_hdr.sh_entsize == esdo->rel_hdr.sh_entsize) + { + rel_count = &esdo->rel_count; + rel_count2 = &esdo->rel_count2; + } + else + { + rel_count = &esdo->rel_count2; + rel_count2 = &esdo->rel_count; + } + + *rel_count += (esdi->rel_hdr.sh_size + / esdi->rel_hdr.sh_entsize); if (esdi->rel_hdr2) - esdo->rel_count2 += (esdi->rel_hdr2->sh_size - / esdi->rel_hdr2->sh_entsize); + *rel_count2 += (esdi->rel_hdr2->sh_size + / esdi->rel_hdr2->sh_entsize); } } -- cgit v1.2.1