[PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles

[PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles

[Khem Raj]

Commit c60b3806799abf1d7f6cf5108a1b0e733a950b13 added support for
aarch64-pe which introduced wrapper over pep-dll.c for x86_64 as well as
aarch64, on x86_64 it was added but the old object pe-dll.o needs to be
removed too, otherwise build fails with duplicate symbols from pe-dll.o
and pep-dll-x86_64.o

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Jedidiah Thompson <wej22007@outlook.com>
Cc: Zac Walker <zac.walker@linaro.org>
---
 ld/configure.tgt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ld/configure.tgt b/ld/configure.tgt
index de04a44b812..f80c84ab13c 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -1047,7 +1047,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
 			;;
 x86_64-*-pe | x86_64-*-pep) targ_emul=i386pep ;
 			targ_extra_emuls=i386pe ;
-			targ_extra_ofiles="deffilep.o pdb.o pep-dll-x86_64.o pe-dll.o"
+			targ_extra_ofiles="deffilep.o pdb.o pep-dll-x86_64.o"
 			;;
 x86_64-*-cygwin)	targ_emul=i386pep ;
 			targ_extra_emuls=i386pe
@@ -1056,7 +1056,7 @@ x86_64-*-cygwin)	targ_emul=i386pep ;
 			;;
 x86_64-*-mingw*)	targ_emul=i386pep ;
 			targ_extra_emuls=i386pe
-			targ_extra_ofiles="deffilep.o pdb.o pep-dll.o pe-dll.o"
+			targ_extra_ofiles="deffilep.o pdb.o pe-dll.o"
 			;;
 x86_64-*-gnu*)		targ_emul=elf_x86_64
 			targ_extra_emuls="elf32_x86_64 elf_iamcu elf_i386"
-- 
2.39.1

Re: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles

[Jan Beulich]

On 19.01.2023 04:51, Khem Raj via Binutils wrote:
> Commit c60b3806799abf1d7f6cf5108a1b0e733a950b13 added support for
> aarch64-pe which introduced wrapper over pep-dll.c for x86_64 as well as
> aarch64, on x86_64 it was added but the old object pe-dll.o needs to be
> removed too, otherwise build fails with duplicate symbols from pe-dll.o
> and pep-dll-x86_64.o

Prior to said change pe-dll.o and pep-dll.o were also _both_ linked in.
You want to explain why _that_ isn't necessary anymore (if that's really
the case, which I doubt; instead I think your change breaks i386pe as
specified via targ_extra_emuls). Otherwise the duplicate symbol errors
(which, btw, I'm not seeing, so there must be more to it than you say)
need dealing with another way.

Jan