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

objcopy: Fix for pr19005 on machines with more than one octet per byte.

Browse Source 
On machines with more than one octet per byte, objcopy fills only a part
of the gap between sections.

	* objcopy.c (copy_object): Convert from bytes to octets for
	--gap-fill and --pad-to.
This commit is contained in:
Christian Eggers
2020-03-02 22:08:20 +01:00
committed by Alan Modra
parent 3ba07c177d
commit eef64366e1
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2020-03-04 Christian Eggers <ceggers@gmx.de>
* objcopy.c (copy_object): Convert from bytes to octets for
--gap-fill and --pad-to.
2020-03-03 Nick Clifton <nickc@redhat.com> 2020-03-03 Nick Clifton <nickc@redhat.com>
PR 25625 PR 25625

28
binutils/objcopy.c
View File

@ -3101,8 +3101,10 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
for (i = 0; i < c - 1; i++) for (i = 0; i < c - 1; i++)
{ {
flagword flags; flagword flags;
bfd_size_type size; bfd_size_type size; /* Octets. */
bfd_vma gap_start, gap_stop; bfd_vma gap_start, gap_stop; /* Octets. */
unsigned int opb1 = bfd_octets_per_byte (obfd, osections[i]);
unsigned int opb2 = bfd_octets_per_byte (obfd, osections[i+1]);
flags = bfd_section_flags (osections[i]); flags = bfd_section_flags (osections[i]);
if ((flags & SEC_HAS_CONTENTS) == 0 if ((flags & SEC_HAS_CONTENTS) == 0
@ -3110,8 +3112,8 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
continue; continue;
size = bfd_section_size (osections[i]); size = bfd_section_size (osections[i]);
gap_start = bfd_section_lma (osections[i]) + size; gap_start = bfd_section_lma (osections[i]) * opb1 + size;
gap_stop = bfd_section_lma (osections[i + 1]); gap_stop = bfd_section_lma (osections[i + 1]) * opb2;
if (gap_start < gap_stop) if (gap_start < gap_stop)
{ {
if (!bfd_set_section_size (osections[i], if (!bfd_set_section_size (osections[i],
@ -3131,14 +3133,16 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
if (pad_to_set) if (pad_to_set)
{ {
bfd_vma lma; bfd_vma lma; /* Octets. */
bfd_size_type size; bfd_size_type size; /* Octets. */
unsigned int opb = bfd_octets_per_byte (obfd, osections[c - 1]);
bfd_vma _pad_to = pad_to * opb;
lma = bfd_section_lma (osections[c - 1]); lma = bfd_section_lma (osections[c - 1]) * opb;
size = bfd_section_size (osections[c - 1]); size = bfd_section_size (osections[c - 1]);
if (lma + size < pad_to) if (lma + size < _pad_to)
{ {
if (!bfd_set_section_size (osections[c - 1], pad_to - lma)) if (!bfd_set_section_size (osections[c - 1], _pad_to - lma))
{ {
bfd_nonfatal_message (NULL, obfd, osections[c - 1], bfd_nonfatal_message (NULL, obfd, osections[c - 1],
_("can't add padding")); _("can't add padding"));
@ -3146,9 +3150,9 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
} }
else else
{ {
gaps[c - 1] = pad_to - (lma + size); gaps[c - 1] = _pad_to - (lma + size);
if (max_gap < pad_to - (lma + size)) if (max_gap < _pad_to - (lma + size))
max_gap = pad_to - (lma + size); max_gap = _pad_to - (lma + size);
} }
} }
} }