From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by sourceware.org (Postfix) with ESMTPS id E3B803858C52 for ; Thu, 19 Jan 2023 03:51:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E3B803858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pg1-x52e.google.com with SMTP id r18so504513pgr.12 for ; Wed, 18 Jan 2023 19:51:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iDCopij0Wvh/W5/7Ipj89xvRMgaFfIBn/dXV1gamQ7k=; b=L7IgvVCjf5ibcI0ZOWhhvOZse/AyVs4VSTV2VWSHSNxRWJajm8EJjrUKGNpmRSUWOt Fk9ezNrE5R+0whWIKbGqODbz977NIvQsJY2LbHOCnswS4zyYwI2e7nmeuexhDzhMOqRr 7gljTxsv/yVwAlzhB9dIJVKu/xjtjab6CVCyUbKHed2dH2gulB3sWBTXNqrVhub5CYHN bt3aPi9tN+yeFScJVsD5WarED9KnZ2AdpIhAS2o0OgJChjUGAo7IXW8rK+QAyHUHI9PQ +CzwJJCYScNCD1Q8sV4l5705scrL0/DE7Q4U3sw2VSUjPj21ckY03xMqNSD9hsBe7myy zUVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iDCopij0Wvh/W5/7Ipj89xvRMgaFfIBn/dXV1gamQ7k=; b=s9xno5PPfX2ZaMYK3NOjyZTSc5NDEMMfrFbpXIcttpOmGdmepRjuNArbZr+L6BoO6w ChGP3saHfPO6yZ/iIFRr3WoII8mWHl9guIDscoSTpMgY6jbSnFTAlMtrhIHNOUFWa/ZA A/bs3PeLaS1n9YvIL2GgD6dyIro8968+UAR1GDxteDIDptvseFZgO83WAJ6pXmwYfzq1 w19iQQafuSItwQ8OZXTHFVC7suSMfbrbu3z9Do3DITTEEDCYYrKmwrJNCxYWle2GjsVo NDoUDGoZko+hlQlswWZz0qW9LpGFfnpRZNHw4Oknl56DJFvuY+uCpfwbre5WcNIOy3HI 7Baw== X-Gm-Message-State: AFqh2kpX/nhOdWUD7OO2OUx+ot/4oJbUqg52a5j2w+JYW7gCh3J6uuWx QPkhImZcS61SrCKLijlKVQFTNARtG4at0Q== X-Google-Smtp-Source: AMrXdXvbtFaI5+IJ5djVXg+LYiuBejU6RPqEFy8KnrstSoXiaocSCTJuQAcYhlJRWyoapxRDRuRxfw== X-Received: by 2002:aa7:96f7:0:b0:582:5b8d:52be with SMTP id i23-20020aa796f7000000b005825b8d52bemr10409885pfq.8.1674100295635; Wed, 18 Jan 2023 19:51:35 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:1cf0::b940]) by smtp.gmail.com with ESMTPSA id h18-20020aa796d2000000b0058dbb5c5038sm5489074pfq.182.2023.01.18.19.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 19:51:35 -0800 (PST) From: Khem Raj To: binutils@sourceware.org Cc: Khem Raj , Jedidiah Thompson , Zac Walker Subject: [PATCH] Remove duplicate pe-dll.o entry deom targ_extra_ofiles Date: Wed, 18 Jan 2023 19:51:26 -0800 Message-Id: <20230119035126.1172654-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 Cc: Jedidiah Thompson Cc: Zac Walker --- 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