ld: Drop pep-dll-{aarch64,x86_64}.c

  When configuring with
'--enable-targets=x86_64-w64-mingw32,aarch64-w64-mingw32', many
duplicate symbol errors are produced:

> /usr/lib/gcc/x86_64-pc-cygwin/16/../../../../x86_64-pc-cygwin/bin/ld: pep-dll-aarch64.o: in function `pep_dll_id_target':
> /wip/binutils-gdb/build/ld/../../ld/pe-dll.c:493: multiple definition of `pep_dll_id_target'; pep-dll.o:/wip/binutils-gdb/build/ld/../../ld/pe-dll.c:493: first defined here
> /usr/lib/gcc/x86_64-pc-cygwin/16/../../../../x86_64-pc-cygwin/bin/ld: pep-dll-aarch64.o: in function `pep_dll_add_excludes':
> /wip/binutils-gdb/build/ld/../../ld/pe-dll.c:586: multiple definition of `pep_dll_add_excludes'; pep-dll.o:/wip/binutils-gdb/build/ld/../../ld/pe-dll.c:586: first defined here
> /usr/lib/gcc/x86_64-pc-cygwin/16/../../../../x86_64-pc-cygwin/bin/ld: pep-dll-aarch64.o: in function `pep_find_data_imports':
> /wip/binutils-gdb/build/ld/../../ld/pe-dll.c:1444: multiple definition of `pep_find_data_imports'; pep-dll.o:/wip/binutils-gdb/build/ld/../../ld/pe-dll.c:1444: first defined here
> /usr/lib/gcc/x86_64-pc-cygwin/16/../../../../x86_64-pc-cygwin/bin/ld: pep-dll-aarch64.o: in function `pep_dll_generate_def_file':
> /wip/binutils-gdb/build/ld/../../ld/pe-dll.c:1877: multiple definition of `pep_dll_generate_def_file'; pep-dll.o:/wip/binutils-gdb/build/ld/../../ld/pe-dll.c:1877: first defined here
> /usr/lib/gcc/x86_64-pc-cygwin/16/../../../../x86_64-pc-cygwin/bin/ld: pep-dll-aarch64.o: in function `pep_create_import_fixup':
> etc.

On investigation, this is unsurprising, since we're compiling the same code twice. In
fact, configure.tgt has:

> arch64-*-pe* | aarch64-*-mingw*)
>                         targ_extra_ofiles="deffilep.o pep-dll-aarch64.o pe-dll.o pdb.o"
> x86_64-*-pe | x86_64-*-pep) targ_emul=i386pep ;
>                         targ_extra_ofiles="deffilep.o pdb.o pep-dll-x86_64.o pe-dll.o"
> x86_64-*-cygwin)        targ_emul=i386pep ;
>                         targ_extra_ofiles="deffilep.o pdb.o pep-dll.o pe-dll.o"
> x86_64-*-mingw*)        targ_emul=i386pep ;
>                         targ_extra_ofiles="deffilep.o pdb.o pep-dll.o pe-dll.o"

... so we're potentially including pep-dll.c compiled under three
different names!

I can't see anything in pe{,p}-dll.c which depends on the
COFF_WITH_peAArch64 or COFF_WITH_pex64 defines, so just remove all this.

(Neither pep-dll-aarch64.o or pep-dll-x86_64.o are listed in
ALL_EMUL_EXTRA_OFILES, so this multiple definition problem doesn't show
up when configured --enable-targets=all', but this seems like another
source of subtle bugs if those defines did do anything here...)

Cc'ed Evgeny (Hi!), because I think this crosses with not-yet-submitted
patches of his which do add some code conditional on COFF_WITH_peAArch64.

I imagine it's possible in code which *does* need to depend on the
output target to replace build time checks of COFF_WITH_pe{AArch64,x64}
with a runtime check of the output architecture (via
pe_details->pe_arch?).

Cc: Evgeny Karpov <evgeny.karpov@arm.com>
Fixes: c60b3806799a ("aarch64-pe support for LD, GAS and BFD")
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>

2026-05-29  Jon Turney  <jon.turney@dronecode.org.uk>

	* Makefile.am (EXTRA_ld_new_SOURCES): Update.
	* Makefile.in: Regenerate.
	* configure.tgt (tar_extra_ofiles): Update.
	* pep-dll-aarch64.c: Remove.
	* pep-dll-x86_64.c: Remove.
---
 ld/Makefile.am       |  3 +--
 ld/Makefile.in       |  6 ++----
 ld/configure.tgt     |  4 ++--
 ld/pep-dll-aarch64.c | 23 -----------------------
 ld/pep-dll-x86_64.c  | 22 ----------------------
 5 files changed, 5 insertions(+), 53 deletions(-)
 delete mode 100644 ld/pep-dll-aarch64.c
 delete mode 100644 ld/pep-dll-x86_64.c
  

On Sun, May 31, 2026 at 03:17:45PM +0100, Jon Turney wrote:
> I can't see anything in pe{,p}-dll.c which depends on the
> COFF_WITH_peAArch64 or COFF_WITH_pex64 defines, so just remove all this.

Yes, and it's not just pe-dll.c but all of its headers.  As evidenced
by the fact that compiling pep-dll.c with either of those defines on
the command line gives the same object as compiling pep-dll.c.

> (Neither pep-dll-aarch64.o or pep-dll-x86_64.o are listed in
> ALL_EMUL_EXTRA_OFILES, so this multiple definition problem doesn't show
> up when configured --enable-targets=all', but this seems like another
> source of subtle bugs if those defines did do anything here...)

True.

> Cc'ed Evgeny (Hi!), because I think this crosses with not-yet-submitted
> patches of his which do add some code conditional on COFF_WITH_peAArch64.
> 
> I imagine it's possible in code which *does* need to depend on the
> output target to replace build time checks of COFF_WITH_pe{AArch64,x64}
> with a runtime check of the output architecture (via
> pe_details->pe_arch?).
> 
> Cc: Evgeny Karpov <evgeny.karpov@arm.com>
> Fixes: c60b3806799a ("aarch64-pe support for LD, GAS and BFD")
> Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
> 
> 2026-05-29  Jon Turney  <jon.turney@dronecode.org.uk>
> 
> 	* Makefile.am (EXTRA_ld_new_SOURCES): Update.
> 	* Makefile.in: Regenerate.
> 	* configure.tgt (tar_extra_ofiles): Update.
> 	* pep-dll-aarch64.c: Remove.
> 	* pep-dll-x86_64.c: Remove.

OK.
  

On Sun, 31 May 2026, Jon Turney wrote:
> I can't see anything in pe{,p}-dll.c which depends on the
> COFF_WITH_peAArch64 or COFF_WITH_pex64 defines, so just remove all this.

> Cc'ed Evgeny (Hi!), because I think this crosses with not-yet-submitted
> patches of his which do add some code conditional on COFF_WITH_peAArch64.
> 
> I imagine it's possible in code which *does* need to depend on the
> output target to replace build time checks of COFF_WITH_pe{AArch64,x64}
> with a runtime check of the output architecture (via
> pe_details->pe_arch?).

Hi Jon, 

Thank you for noticing not-yet-upstreamed patches that introduce 
COFF_WITH_peAArch64 in pe-dll.c. The change looks reasonable, and impacted
patches will be updated with necessary declarations.

LGTM for aarch64-w64-mingw32 target.

Regards,
Evgeny
  

On 31/05/2026 23:19, Alan Modra wrote:
> On Sun, May 31, 2026 at 03:17:45PM +0100, Jon Turney wrote:
>> I can't see anything in pe{,p}-dll.c which depends on the
>> COFF_WITH_peAArch64 or COFF_WITH_pex64 defines, so just remove all this.
> 
> Yes, and it's not just pe-dll.c but all of its headers.  As evidenced
> by the fact that compiling pep-dll.c with either of those defines on
> the command line gives the same object as compiling pep-dll.c.

Thanks for double checking!

(In fact, I think COFF_WITH_pe{AArch674,x64} are only used in pep.em, 
which I guess is the only place it makes sense to use them, given my 
vague memory of the preprocessing gymnastics that go on there...)

>> (Neither pep-dll-aarch64.o or pep-dll-x86_64.o are listed in
>> ALL_EMUL_EXTRA_OFILES, so this multiple definition problem doesn't show
>> up when configured --enable-targets=all', but this seems like another
>> source of subtle bugs if those defines did do anything here...)
> 
> True.
> 
>> Cc'ed Evgeny (Hi!), because I think this crosses with not-yet-submitted
>> patches of his which do add some code conditional on COFF_WITH_peAArch64.
>>
>> I imagine it's possible in code which *does* need to depend on the
>> output target to replace build time checks of COFF_WITH_pe{AArch64,x64}
>> with a runtime check of the output architecture (via
>> pe_details->pe_arch?).
>>
>> Cc: Evgeny Karpov <evgeny.karpov@arm.com>
>> Fixes: c60b3806799a ("aarch64-pe support for LD, GAS and BFD")
>> Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
>>
>> 2026-05-29  Jon Turney  <jon.turney@dronecode.org.uk>
>>
>> 	* Makefile.am (EXTRA_ld_new_SOURCES): Update.
>> 	* Makefile.in: Regenerate.
>> 	* configure.tgt (tar_extra_ofiles): Update.
>> 	* pep-dll-aarch64.c: Remove.
>> 	* pep-dll-x86_64.c: Remove.
> 
> OK.

Thanks, applied.