Commit: 86f7d49be5e3dee5ca8326e3766983a27a968486 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revisión: 86f7d49be5e3dee5ca8326e3766983a27a968486 (tree)
• Tiempo: 2013-04-23 00:03:01
• Autor: Alan Modra <amodra@gmai...>
• Commiter: Alan Modra

Log Message

PR ld/15382
* elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Don't multiply
sh_size or reloc_count adjustment by count.

Cambiar Resumen

• modified: bfd/ChangeLog
• modified: bfd/elf-bfd.h

Diferencia incremental

--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 2013-04-22  Alan Modra  <[e-mail]>
 
+	PR ld/15382
+	* elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Don't multiply
+	sh_size or reloc_count adjustment by count.
+
[phone]  Alan Modra  <[e-mail]>
+
 	* elf64-ppc.c (ppc64_elf_check_relocs): Don't call
 	create_linkage_sections here..
 	(ppc64_elf_init_stub_bfd): ..do so here.  Return status.

--- 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;							\