From: Khem Raj <raj.khem@gmail.com>
To: binutils@sourceware.org
Cc: Khem Raj <raj.khem@gmail.com>,
Jedidiah Thompson <wej22007@outlook.com>,
Zac Walker <zac.walker@linaro.org>
Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles
Date: Wed, 18 Jan 2023 19:51:26 -0800 [thread overview]
Message-ID: <20230119035126.1172654-1-raj.khem@gmail.com> (raw)
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
next reply other threads:[~2023-01-19 3:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 3:51 Khem Raj [this message]
2023-01-19 9:38 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230119035126.1172654-1-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=binutils@sourceware.org \
--cc=wej22007@outlook.com \
--cc=zac.walker@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).