FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* merge.c (_bfd_merge_section): Remove redundant output_section check.

Browse source 
Formatting.
	(_bfd_merge_sections): Don't set SEC_EXCLUDE on unused sections.
This commit is contained in:
Alan Modra 2002-07-09 23:47:22 +00:00
parent f15f768ee5
commit 699cb9b870
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
2002-07-10 Alan Modra <amodra@bigpond.net.au>
* merge.c (_bfd_merge_section): Remove redundant output_section check.
Formatting.
(_bfd_merge_sections): Don't set SEC_EXCLUDE on unused sections.
2002-07-09 Hans-Peter Nilsson <hp@axis.com>
* elf32-cris.c (cris_elf_relocate_section): Move sanity-check for

20
bfd/merge.c
View file

@ -383,14 +383,6 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
return true;
}
if (sec->output_section != NULL
&& bfd_is_abs_section (sec->output_section))
{
/* The section is being discarded from the link, so we should
just ignore it. */
return true;
}
align = bfd_get_section_alignment (sec->owner, sec);
if ((sec->entsize < (unsigned int)(1 << align)
&& ((sec->entsize & (sec->entsize - 1))
@ -417,15 +409,14 @@ _bfd_merge_section (abfd, psinfo, sec, psecinfo)
if (sinfo == NULL)
{
/* Initialize the information we need to keep track of. */
sinfo = (struct sec_merge_info *)
bfd_alloc (abfd, (bfd_size_type) sizeof (struct sec_merge_info));
amt = sizeof (struct sec_merge_info);
sinfo = (struct sec_merge_info *) bfd_alloc (abfd, amt);
if (sinfo == NULL)
goto error_return;
sinfo->next = (struct sec_merge_info *) *psinfo;
sinfo->chain = NULL;
*psinfo = (PTR) sinfo;
sinfo->htab =
sec_merge_init (sec->entsize, (sec->flags & SEC_STRINGS));
sinfo->htab = sec_merge_init (sec->entsize, (sec->flags & SEC_STRINGS));
if (sinfo->htab == NULL)
goto error_return;
}
@ -843,10 +834,7 @@ _bfd_merge_sections (abfd, xsinfo, remove_hook)
the hash table at all. */
for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
if (secinfo->first == NULL)
{
secinfo->sec->_cooked_size = 0;
secinfo->sec->flags |= SEC_EXCLUDE;
}
secinfo->sec->_cooked_size = 0;
}
return true;