From 86f7d49be5e3dee5ca8326e3766983a27a968486 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 22 Apr 2013 15:03:01 +0000 Subject: [PATCH] PR ld/15382 * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Don't multiply sh_size or reloc_count adjustment by count. --- bfd/ChangeLog | 6 ++++++ bfd/elf-bfd.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c8d5619d7fc..0c62889362b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2013-04-22 Alan Modra + + PR ld/15382 + * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Don't multiply + sh_size or reloc_count adjustment by count. + 2013-04-22 Alan Modra * elf64-ppc.c (ppc64_elf_check_relocs): Don't call diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 3b4bd6f9894..b643dbc8a80 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -2497,16 +2497,16 @@ extern asection _bfd_elf_large_com_section; rel_hdr = _bfd_elf_single_rel_hdr (input_section->output_section); \ \ /* Avoid empty output section. */ \ - if (rel_hdr->sh_size > count * rel_hdr->sh_entsize) \ + if (rel_hdr->sh_size > rel_hdr->sh_entsize) \ { \ - rel_hdr->sh_size -= count * rel_hdr->sh_entsize; \ + rel_hdr->sh_size -= rel_hdr->sh_entsize; \ rel_hdr = _bfd_elf_single_rel_hdr (input_section); \ - rel_hdr->sh_size -= count * rel_hdr->sh_entsize; \ + rel_hdr->sh_size -= rel_hdr->sh_entsize; \ \ memmove (rel, rel + count, \ (relend - rel - count) * sizeof (*rel)); \ \ - input_section->reloc_count -= count; \ + input_section->reloc_count--; \ relend -= count; \ rel--; \ continue; \ -- 2.30.2