elf/x86-64: Subtract __ImageBase for R_AMD64_IMAGEBASE
authorH.J. Lu <hjl.tools@gmail.com>
Sat, 6 Mar 2021 02:24:56 +0000 (18:24 -0800)
committerH.J. Lu <hjl.tools@gmail.com>
Sat, 6 Mar 2021 02:25:06 +0000 (18:25 -0800)
commit8c0546e928b557f10cb5aba2a91f3ecee660029d
treefa6de685644e0fc9b754cd1d81a28c1a7f6c3ee8
parentb0a8c2ff9c1b5f7d2e1ef1e0d65dcff0e9f089cc
elf/x86-64: Subtract __ImageBase for R_AMD64_IMAGEBASE

When linking Windows x86-64 relocatable object files to generate x86-64
ELF executable, we need to subtract __ImageBase, aka __executable_start,
for R_AMD64_IMAGEBASE relocation:

1. Add link_info to struct output_elf_obj_tdata to store linker info and
_bfd_get_link_info() to retrieve it.
2. Add ldelf_set_output_arch to set up link_info.
3. Add pex64_link_add_symbols to create an indirect reference to
__executable_start for __ImageBase to support R_AMD64_IMAGEBASE relocation
when adding symbols from Windows x86-64 relocatable object files to
generate x86-64 ELF executable.
4. Also subtract __ImageBase for R_AMD64_IMAGEBASE when generating x86-64
ELF executable.

bfd/

PR ld/27425
PR ld/27432
* bfd.c (_bfd_get_link_info): New function.
* elf-bfd.h (output_elf_obj_tdata): Add link_info.
(elf_link_info): New.
* libbfd-in.h (_bfd_get_link_info): New prototype.
* coff-x86_64.c (coff_amd64_reloc): Also subtract __ImageBase for
R_AMD64_IMAGEBASE when generating x86-64 ELF executable.
* pe-x86_64.c: Include "coff/internal.h" and "libcoff.h".
(pex64_link_add_symbols): New function.
(coff_bfd_link_add_symbols): New macro.
* libbfd.h: Regenerated.

ld/

PR ld/27425
PR ld/27432
* ldelf.c (ldelf_set_output_arch): New function.
* ldelf.h (ldelf_set_output_arch): New prototype.
* emultempl/elf.em (LDEMUL_SET_OUTPUT_ARCH): Default to
ldelf_set_output_arch.
* ld-x86-64/pe-x86-64-1.od: Expect __executable_start.
* testsuite/ld-x86-64/pe-x86-64-2.od: Likewise.
* testsuite/ld-x86-64/pe-x86-64-3.od: Likewise.
* testsuite/ld-x86-64/pe-x86-64-4.od: Likewise.
* testsuite/ld-x86-64/pe-x86-64-5.od: Likewise.
* testsuite/ld-x86-64/pe-x86-64-5.rd: Likewise.
* testsuite/ld-x86-64/pe-x86-64-6.obj.bz2: New file.
* testsuite/ld-x86-64/pe-x86-64-6.od: Likewise.
* testsuite/ld-x86-64/pe-x86-64.exp: Run ld/27425 test.
20 files changed:
bfd/ChangeLog
bfd/bfd.c
bfd/coff-x86_64.c
bfd/elf-bfd.h
bfd/libbfd-in.h
bfd/libbfd.h
bfd/pe-x86_64.c
ld/ChangeLog
ld/emultempl/elf.em
ld/ldelf.c
ld/ldelf.h
ld/testsuite/ld-x86-64/pe-x86-64-1.od
ld/testsuite/ld-x86-64/pe-x86-64-2.od
ld/testsuite/ld-x86-64/pe-x86-64-3.od
ld/testsuite/ld-x86-64/pe-x86-64-4.od
ld/testsuite/ld-x86-64/pe-x86-64-5.od
ld/testsuite/ld-x86-64/pe-x86-64-5.rd
ld/testsuite/ld-x86-64/pe-x86-64-6.obj.bz2 [new file with mode: 0644]
ld/testsuite/ld-x86-64/pe-x86-64-6.od [new file with mode: 0644]
ld/testsuite/ld-x86-64/pe-x86-64.exp