Ah bah, missed these from last commit.
This commit is contained in:
parent
b6821651ed
commit
ad12c1c577
3 changed files with 3 additions and 31 deletions
|
@ -14,6 +14,8 @@
|
|||
* elf32-qnx.h: Remove.
|
||||
* elf.c: Remove calls to QNX specific set_nonloadable_filepos,
|
||||
is_contained_by_filepos, and copy_private_bfd_data_p.
|
||||
* elf-bfd.h (struct elf_backend_data): Remove set_nonloadable_filepos,
|
||||
is_contained_by_filepos, and copy_private_bfd_data_p.
|
||||
* elf32-i386.c: Remove QNX extended bfd support.
|
||||
* elf32-ppc.c: Remove QNX extended bfd support.
|
||||
* elf32-sh.c: Remove QNX extended bfd support.
|
||||
|
|
|
@ -770,22 +770,6 @@ struct elf_backend_data
|
|||
boolean (*elf_backend_write_section)
|
||||
PARAMS ((bfd *, asection *, bfd_byte *));
|
||||
|
||||
/* This function, if defined, sets up the file positions for non PT_LOAD
|
||||
segments, especially for segments containing non-allocated sections. */
|
||||
void (*set_nonloadable_filepos)
|
||||
PARAMS ((bfd *, Elf_Internal_Phdr *));
|
||||
|
||||
/* This function, if defined, returns true if the section is contained
|
||||
within the segment. File positions are compared. */
|
||||
boolean (*is_contained_by_filepos)
|
||||
PARAMS ((asection *, Elf_Internal_Phdr *));
|
||||
|
||||
/* This function, if defined, returns true if copy_private_bfd_data
|
||||
should be called. It provides a way of overriding default
|
||||
test conditions in _bfd_elf_copy_private_section_data. */
|
||||
boolean (*copy_private_bfd_data_p)
|
||||
PARAMS ((bfd *, asection *, bfd *, asection *));
|
||||
|
||||
/* The level of IRIX compatibility we're striving for.
|
||||
MIPS ELF specific function. */
|
||||
irix_compat_t (*elf_backend_mips_irix_compat)
|
||||
|
|
16
bfd/elf.c
16
bfd/elf.c
|
@ -5089,26 +5089,12 @@ _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
|
|||
asection *osec;
|
||||
{
|
||||
Elf_Internal_Shdr *ihdr, *ohdr;
|
||||
const struct elf_backend_data *bed = get_elf_backend_data (ibfd);
|
||||
|
||||
if (ibfd->xvec->flavour != bfd_target_elf_flavour
|
||||
|| obfd->xvec->flavour != bfd_target_elf_flavour)
|
||||
return true;
|
||||
|
||||
/* Copy over private BFD data if it has not already been copied.
|
||||
This must be done here, rather than in the copy_private_bfd_data
|
||||
entry point, because the latter is called after the section
|
||||
contents have been set, which means that the program headers have
|
||||
already been worked out. The backend function provides a way to
|
||||
override the test conditions and code path for the call to
|
||||
copy_private_bfd_data. */
|
||||
if (bed->copy_private_bfd_data_p)
|
||||
{
|
||||
if ((*bed->copy_private_bfd_data_p) (ibfd, isec, obfd, osec))
|
||||
if (! copy_private_bfd_data (ibfd, obfd))
|
||||
return false;
|
||||
}
|
||||
else if (elf_tdata (obfd)->segment_map == NULL && elf_tdata (ibfd)->phdr != NULL)
|
||||
if (elf_tdata (obfd)->segment_map == NULL && elf_tdata (ibfd)->phdr != NULL)
|
||||
{
|
||||
asection *s;
|
||||
|
||||
|
|
Loading…
Reference in a new issue