espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-04 13:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert the last checkin on sec_merge_emit.

Browse Source 
2010-08-20  H.J. Lu  <hongjiu.lu@intel.com>

	* merge.c (sec_merge_emit): Revert the last checkin.
This commit is contained in:
H.J. Lu
2010-08-20 22:29:28 +00:00
parent d820eaae5f
commit 3409e291c1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bfd/ChangeLog
View File

@ -1,3 +1,7 @@
2010-08-20 H.J. Lu <hongjiu.lu@intel.com>
* merge.c (sec_merge_emit): Revert the last checkin.
2010-08-20 Maciej W. Rozycki <macro@codesourcery.com> 2010-08-20 Maciej W. Rozycki <macro@codesourcery.com>
* elf32-sh.c (sh_elf_relocate_section): Handle non-ELF output * elf32-sh.c (sh_elf_relocate_section): Handle non-ELF output

4
bfd/merge.c
View File

@ -307,9 +307,6 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry)
len = -off & (entry->alignment - 1); len = -off & (entry->alignment - 1);
if (len != 0) if (len != 0)
{ {
/* We should never have an entry with an alignment
greater than the section's alignment. */
BFD_ASSERT (len <= (bfd_size_type) (1 << alignment_power));
if (bfd_bwrite (pad, len, abfd) != len) if (bfd_bwrite (pad, len, abfd) != len)
goto err; goto err;
off += len; off += len;
@ -327,7 +324,6 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry)
/* Trailing alignment needed? */ /* Trailing alignment needed? */
off = sec->size - off; off = sec->size - off;
if (off != 0 if (off != 0
&& alignment_power
&& bfd_bwrite (pad, off, abfd) != off) && bfd_bwrite (pad, off, abfd) != off)
goto err; goto err;