1From ddd941856582a82171626cbe609325b11e223704 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Wed, 18 Jan 2023 19:35:07 -0800 4Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles 5 6Commit c60b3806799abf1d7f6cf5108a1b0e733a950b13 added support for 7aarch64-pe which introduced wrapper over pep-dll.c for x86_64 as well as 8aarch64, on x86_64 it was added but the old object pe-dll.o needs to be 9removed too, otherwise build fails with duplicate symbols from pe-dll.o 10and pep-dll-x86_64.o 11 12Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2023-January/125739.html] 13Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Cc: Jedidiah Thompson <wej22007@outlook.com> 15Cc: Zac Walker <zac.walker@linaro.org> 16--- 17 ld/configure.tgt | 2 +- 18 1 file changed, 1 insertion(+), 1 deletion(-) 19 20diff --git a/ld/configure.tgt b/ld/configure.tgt 21index f937f78b876..830613744c2 100644 22--- a/ld/configure.tgt 23+++ b/ld/configure.tgt 24@@ -1067,7 +1067,7 @@ x86_64-*-cygwin) targ_emul=i386pep ; 25 ;; 26 x86_64-*-mingw*) targ_emul=i386pep ; 27 targ_extra_emuls=i386pe 28- targ_extra_ofiles="deffilep.o pdb.o pep-dll.o pe-dll.o" 29+ targ_extra_ofiles="deffilep.o pdb.o pe-dll.o" 30 ;; 31 x86_64-*-gnu*) targ_emul=elf_x86_64 32 targ_extra_emuls="elf32_x86_64 elf_iamcu elf_i386" 33