From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by mx.groups.io with SMTP id smtpd.web10.15354.1683721906777190066 for ; Wed, 10 May 2023 05:31:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm1 header.b=07FzCNr0; spf=pass (domain: bsdio.com, ip: 64.147.123.19, mailfrom: rebecca@bsdio.com) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 9CCF13200917; Wed, 10 May 2023 08:31:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 10 May 2023 08:31:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; t=1683721905; x=1683808305; bh=VZH8ZJlFkt 75gs9vWBCxz4nzdpLK9IKoxIxYXyxjjuo=; b=07FzCNr02FgqElwBUw8IxW0Zda bK5z2xsrSG6BPTzF9QXr5iJptu61PAmthQK/jRUE7EXrYagSQGtn7HHvmiu3RkqY 3pCkV9zJQwowEyuertIkCKH58UlDEdqk9kI6xQqZUgFKburcWrYFqh20gxrk8a3B eQgn0iQLarMu7PRMgHp6Tc2nvM9fREJx/4FEzyJfjVJ0iX+SNiJM3nMe95nChGh5 zjEmiub2h8xJT0d6VGYtEIliE63I9KKuAAL1JuEmBNvxCXtHM8moSdfQNeVFoB9H jmcs+pMalF9Y2Ew0zcszdpd93bF/EgPf1F/MCJW/PbetafAHVnqEPx9WMDXA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1683721905; x=1683808305; bh=VZH8ZJlFkt75g s9vWBCxz4nzdpLK9IKoxIxYXyxjjuo=; b=ZfK8kmHziEJ/Ibjf0FUcYByAzbYGU AsVxDhBUsxORLGVUeBcxsbAkxXpxqLAesHKhXwUM1I63PiE6pTOU7pnmOd+SB2k5 iIig4GCW2QTG0E05vNTszPmcFYzvnJI6qcG/W0aXZ51YJ8nHh0tuTLWt2Msj+8OM 0fV8hOzcVONX5WgQzKeGktNPAcPOPvJ0tnEJFuVEK+UyMJeH7NK4TtNwhAohGle2 rk6/VD3Lse5A52zWPFw2CF8tnsn11cUTOmWvRujWu1pTCIXEcQpB2nd4XQBmOwXF vqa8g18urrOsxqFv0zqa2ZkueqMhoVKLdTUGnCRcg2+UQNT7yngyuDcTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeegiedgfedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheptfgvsggvtggt rgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrthhtvg hrnhepuedvkedtleekueekgfejjeettefftdduiefffeehveefgfevueelgffhleelgfdv necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprhgvsg gvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 10 May 2023 08:31:43 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen , Ard Biesheuvel Cc: Rebecca Cran Subject: [edk2-stable202305 PATCH 1/1] BaseTools: Revert Set the CLANGDWARF OBJCOPY path in tools_def.template Date: Wed, 10 May 2023 06:31:41 -0600 Message-Id: <20230510123141.1880782-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit 11f62f4cc09f16d265da1a737dabfd8ed65f8c00. While GCC uses objcopy for the OBJCOPY command, it's not needed for the CLANGDWARF toolchain and can be left as echo. Signed-off-by: Rebecca Cran --- BaseTools/Conf/tools_def.template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index b3c822f0bc20..042b1e142b1b 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1864,7 +1864,6 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_ ########################### # CLANGDWARF IA32 definitions ########################### -*_CLANGDWARF_IA32_OBJCOPY_PATH = DEF(CLANGDWARF_IA32_PREFIX)llvm-objcopy *_CLANGDWARF_IA32_CC_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang *_CLANGDWARF_IA32_SLINK_PATH = DEF(CLANGDWARF_IA32_PREFIX)llvm-ar *_CLANGDWARF_IA32_DLINK_PATH = DEF(CLANGDWARF_IA32_PREFIX)clang @@ -1901,7 +1900,6 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS = DEF(CLANGDWARF_IA32_DLINK2_FLAGS) -O0 - ########################## # CLANGDWARF X64 definitions ########################## -*_CLANGDWARF_X64_OBJCOPY_PATH = DEF(CLANGDWARF_X64_PREFIX)llvm-objcopy *_CLANGDWARF_X64_CC_PATH = DEF(CLANGDWARF_X64_PREFIX)clang *_CLANGDWARF_X64_SLINK_PATH = DEF(CLANGDWARF_X64_PREFIX)llvm-ar *_CLANGDWARF_X64_DLINK_PATH = DEF(CLANGDWARF_X64_PREFIX)clang @@ -1949,7 +1947,6 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS = DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI *_CLANGDWARF_ARM_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS) *_CLANGDWARF_ARM_DTCPP_FLAGS = DEF(GCC_DTCPP_FLAGS) -*_CLANGDWARF_ARM_OBJCOPY_PATH = ENV(CLANGDWARF_BIN)llvm-objcopy *_CLANGDWARF_ARM_CC_PATH = ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_ARM_ASM_PATH = ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_ARM_PP_PATH = ENV(CLANGDWARF_BIN)clang @@ -1994,7 +1991,6 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS = DEF(CLANGDWARF_AARCH64_TARGET) DEF(GCC_ *_CLANGDWARF_AARCH64_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS) *_CLANGDWARF_AARCH64_DTCPP_FLAGS = DEF(GCC_DTCPP_FLAGS) -*_CLANGDWARF_AARCH64_OBJCOPY_PATH = ENV(CLANGDWARF_BIN)llvm-objcopy *_CLANGDWARF_AARCH64_CC_PATH = ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_AARCH64_ASM_PATH = ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_AARCH64_PP_PATH = ENV(CLANGDWARF_BIN)clang -- 2.39.2