yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust the output section size to skip gap fills

Browse Source 
In objcopy, copy_object calls copy_section to copy contents of input
section to output section.  When --gap-fill= is used, objcopy extends
the size of output sectios to fill gaps between output sections with
gap fills.  In this case, we adjust the output section size to skip
gap files to avoid reading beypond the input section buffer before
calling copy_section and restore the output section size after input
sections have been copied.

binutils/

	PR binutils/19005
	* objcopy.c (copy_object): Adjust the output section size to
	skip gap fills between sections when copying from input sections
	to output sections.

ld/testsuite/

	PR binutils/19005
	* ld-elf/pr19005.d: New file.
	* ld-elf/pr19005.s: Likewise.
	* ld-elf/pr19005.t: Likewise.
This commit is contained in:
H.J. Lu 2015-09-29 06:33:03 -07:00
parent 7ecc513a44
commit c68c163716
6 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binutils/ChangeLog
View File

@ -1,3 +1,10 @@
2015-09-29 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/19005
* objcopy.c (copy_object): Adjust the output section size to
skip gap fills between sections when copying from input sections
to output sections.
2015-09-28 Nick Clifton <nickc@redhat.com>
* po/fr.po: Updated French translation.

24
binutils/objcopy.c
View File

@ -1640,6 +1640,7 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
void *dhandle;
enum bfd_architecture iarch;
unsigned int imach;
unsigned int c, i;
if (ibfd->xvec->byteorder != obfd->xvec->byteorder
&& ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
@ -2071,11 +2072,11 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
}
}
if (bfd_count_sections (obfd) != 0
c = bfd_count_sections (obfd);
if (c != 0
&& (gap_fill_set || pad_to_set))
{
asection **set;
unsigned int c, i;
/* We must fill in gaps between the sections and/or we must pad
the last section to a specified address. We do this by
@ -2083,7 +2084,6 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
increasing the section sizes as required to fill the gaps.
We write out the gap contents below. */
c = bfd_count_sections (obfd);
osections = (asection **) xmalloc (c * sizeof (asection *));
set = osections;
bfd_map_over_sections (obfd, get_sections, &set);
@ -2212,7 +2212,24 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
bfd_map_over_sections (ibfd, copy_relocations_in_section, obfd);
/* This has to happen after the symbol table has been set. */
if (gap_fill_set)
{
/* Adjust the output section size to skip gap fills between
sections. */
c = bfd_count_sections (obfd);
for (i = 0; i < c; i++)
if (gaps[i] != 0)
osections[i]->size -= gaps[i];
}
bfd_map_over_sections (ibfd, copy_section, obfd);
if (gap_fill_set)
{
/* Restore the output section size for gap fills between
sections. */
for (i = 0; i < c; i++)
if (gaps[i] != 0)
osections[i]->size += gaps[i];
}
if (add_sections != NULL)
{
@ -2264,7 +2281,6 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
if (gap_fill_set || pad_to_set)
{
bfd_byte *buf;
int c, i;
/* Fill in the gaps. */
if (max_gap > 8192)

7
ld/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2015-09-29 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/19005
* ld-elf/pr19005.d: New file.
* ld-elf/pr19005.s: Likewise.
* ld-elf/pr19005.t: Likewise.
2015-08-11 Peter Zotov <whitequark@whitequark.org>
PR ld/18759

10
ld/testsuite/ld-elf/pr19005.d Normal file
View File

@ -0,0 +1,10 @@
#ld: -Tpr19005.t
#objcopy_linked_file: -O binary -j .foo -j .bar --gap-fill=0xff
#objdump: -b binary -s
#...
Contents of section .data:
0000 10ffffff ffffffff ffffffff ffffffff ................
0010 ffffffff ffffffff ffffffff ffffffff ................
0020 20.*
#pass

11
ld/testsuite/ld-elf/pr19005.s Normal file
View File

@ -0,0 +1,11 @@
.section .foo,"ax",%progbits
.globl _start
.type _start, %function
_start:
.byte 0x10
.section .bar,"ax",%progbits
.globl aligned
.type aligned, %function
.p2align 5
aligned:
.byte 0x20

6
ld/testsuite/ld-elf/pr19005.t Normal file
View File

@ -0,0 +1,6 @@
SECTIONS
{
.foo : { *(.foo) }
.bar : { *(.bar) }
/DISCARD/ : { *(.*) }
}