git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 9599d7d48913fca4c2bf0d0012f9655353ca6f6c Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Wed, 18 Jan 2023 19:35:07 -0800
   4 Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles
   5
   6 Commit c60b3806799abf1d7f6cf5108a1b0e733a950b13 added support for
   7 aarch64-pe which introduced wrapper over pep-dll.c for x86_64 as well as
   8 aarch64, on x86_64 it was added but the old object pe-dll.o needs to be
   9 removed too, otherwise build fails with duplicate symbols from pe-dll.o
  10 and pep-dll-x86_64.o
  11
  12 Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2023-January/125739.html]
  13 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  14 Cc: Jedidiah Thompson <wej22007@outlook.com>
  15 Cc: Zac Walker <zac.walker@linaro.org>
  16 ---
  17  ld/configure.tgt | 4 ++--
  18  1 file changed, 2 insertions(+), 2 deletions(-)
  19
  20 diff --git a/ld/configure.tgt b/ld/configure.tgt
  21 index de04a44b812..f80c84ab13c 100644
  22 --- a/ld/configure.tgt
  23 +++ b/ld/configure.tgt
  24 @@ -1056,7 +1056,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"