From nobody Sun May 19 05:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104439+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104439+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683676427; cv=none; d=zohomail.com; s=zohoarc; b=iwBsKZ+dot1GF1GWl4WSXXdIartKhScvwaoK1mz/vnRK86US511UpQZiQrIvE/bA5oU4QJy8sPLynO4PWZ0/kah/KLrhfzVi5WB1y8FLHx3xB/qV1mJLBsCNXyVxhc5ZselE2n++Dl0jlmyGs6jcqw6O+22bDrYAemD87SN2hSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683676427; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=pIp+vMYlAMIORCjNgiJ2pfyYavXuMqlyH7N0Q7Ps48k=; b=DnkZHn8lCnPtbgSoXbHuawWKgKKSWmy3BH5MvqZs3TOxZEyb/P031rv1zngKcL7QvugoSIPy5+DXEllmCAKuQuNbUBPqShcNpOpXUd8MmL0O79nP7WBg+BWi8Horm0ejvayaBuHodcBdal3vyHHhJ6/vv/k4rQiR+pcdX6lxLgw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104439+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683676427723810.2856275276014; Tue, 9 May 2023 16:53:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8MDAYY1788612xCg7HBA0Mws; Tue, 09 May 2023 16:53:47 -0700 X-Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mx.groups.io with SMTP id smtpd.web10.4598.1683676426945107378 for ; Tue, 09 May 2023 16:53:47 -0700 X-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 29C88320095F; Tue, 9 May 2023 19:53:46 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 09 May 2023 19:53:46 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeegvddgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 19:53:44 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [edk2-stable202305 PATCH 1/4] BaseTools: Remove BUILDRULEFAMILY from CLANGDWARF in tools_def.template Date: Tue, 9 May 2023 17:53:34 -0600 Message-Id: <20230509235337.1815842-2-rebecca@bsdio.com> In-Reply-To: <20230509235337.1815842-1-rebecca@bsdio.com> References: <20230509235337.1815842-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: FPuAw8QUzN51eUdENtfcycc7x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683676427; bh=AEvZI2IePeTyntrrjjNoLIhLA6SpdOYqLHeZKVybmcI=; h=Cc:Date:From:Reply-To:Subject:To; b=SJjHcaE/U2yj231X2xt2v8QsoHDj9S1hu8gkV114/U6JLNvUF3zdyqwZnjLsxbeNJV+ rJabWB1EB6hw5svdbPCuLUm/2A1aTA1mWfw12UF+UJ0V94aI0WFOG8KsZUjn0Lk00U6Hb 8gIjlmZiHXUoSZHSz9P0s/DpofwanOmyuE0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683676428133100002 Content-Type: text/plain; charset="utf-8" There's only a single rule in build_rule.template for CLANGGCC, and it's incorrect. We should instead just use the rules for GCC, so remove the BUILDRULEFAMILY line for the CLANGDWARF toolchain definition. Signed-off-by: Rebecca Cran --- BaseTools/Conf/tools_def.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index e096aadb495d..8ed9cd3da4fa 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1834,7 +1834,7 @@ NOOPT_CLANGPDB_X64_GENFW_FLAGS =3D --keepexcepti= ontable # ##########################################################################= ########## *_CLANGDWARF_*_*_FAMILY =3D GCC -*_CLANGDWARF_*_*_BUILDRULEFAMILY =3D CLANGGCC + *_CLANGDWARF_*_MAKE_PATH =3D ENV(CLANG_HOST_BIN)make *_CLANGDWARF_*_*_DLL =3D ENV(CLANGDWARF_DLL) *_CLANGDWARF_*_ASL_PATH =3D DEF(UNIX_IASL_BIN) --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104439): https://edk2.groups.io/g/devel/message/104439 Mute This Topic: https://groups.io/mt/98796311/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 05:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104440+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104440+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683676429; cv=none; d=zohomail.com; s=zohoarc; b=l+4g+IMLIGQ5GgyPCKMm6oH89G5UOWvlnGnh6fQYrJH2102YsL1YgG2k0RcM0lBAyTG8MzLPC9cQ3APebXmTedizL4RgaVM8hunt8aKka7qLSOxMpIhOpSgQdy9RcTSWTX4tkH7JP94cV9CmiWxUjNUzeSmuMPqVnuUWFFRqgSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683676429; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=p33i88bnZAVb0Jb3mILkrL4TimqRzqmvcqeRSgEcwus=; b=LowsHmhLJfRFBYjA6nIgiuULViU3zjySq85P9dgwllwak3YyEtl3cL29MEzAg53nraqaPHafE2r+uwH6FEoNPQ1RUGBZwPHiEP36zttmnf7yiqnMPBiK/smP5IVVUL3llo2825ZxfaHrtLWd0/LQsTKQkfg0110DTrffyMlZqHE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104440+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683676429723229.88090835631056; Tue, 9 May 2023 16:53:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id xzc5YY1788612x2hNixHvUR5; Tue, 09 May 2023 16:53:49 -0700 X-Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mx.groups.io with SMTP id smtpd.web10.4599.1683676428823101083 for ; Tue, 09 May 2023 16:53:48 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 056113200976; Tue, 9 May 2023 19:53:47 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 09 May 2023 19:53:48 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeegvddgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 19:53:46 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [edk2-stable202305 PATCH 2/4] BaseTools: Set the CLANGDWARF OBJCOPY path in tools_def.template Date: Tue, 9 May 2023 17:53:35 -0600 Message-Id: <20230509235337.1815842-3-rebecca@bsdio.com> In-Reply-To: <20230509235337.1815842-1-rebecca@bsdio.com> References: <20230509235337.1815842-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: lKXHfEpTzkHhT6yZax9W1hK1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683676429; bh=RHwJwrH45mhsbFkHbi7uP+3wauP6y4deFG/ozitRaVk=; h=Cc:Date:From:Reply-To:Subject:To; b=J1TmhatNSwBzIHaGOZWCOZTNcZKZ/ORQ+kYSXVCKGJVQb0gSGC2KOEE1RAbHG5PUk0q EpjfxNy817rrSchtZGfIFO9OjZ3WvsA7LPpBznygP3RU0MzOLXo01DvhyurwvjUX+5Xm6 jZpXFpgBn0ZtQtehXi/+b5X2XpilF+Noq5o= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683676431164100001 Content-Type: text/plain; charset="utf-8" Set the OBJCOPY path for the CLANGDWARF toolchain to 'llvm-objcopy' to override the default of 'echo'. Signed-off-by: Rebecca Cran --- BaseTools/Conf/tools_def.template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 8ed9cd3da4fa..96a413c4ca79 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1864,6 +1864,7 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS =3D DEF(GCC48_= ALL_CC_FLAGS) DEF(CLANGDWARF_ ########################### # CLANGDWARF IA32 definitions ########################### +*_CLANGDWARF_IA32_OBJCOPY_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)llvm= -objcopy *_CLANGDWARF_IA32_CC_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)clang *_CLANGDWARF_IA32_SLINK_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)llvm= -ar *_CLANGDWARF_IA32_DLINK_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)clang @@ -1900,6 +1901,7 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS =3D DEF(CLANGD= WARF_IA32_DLINK2_FLAGS) -O0 - ########################## # CLANGDWARF X64 definitions ########################## +*_CLANGDWARF_X64_OBJCOPY_PATH =3D DEF(CLANGDWARF_X64_PREFIX)llvm-o= bjcopy *_CLANGDWARF_X64_CC_PATH =3D DEF(CLANGDWARF_X64_PREFIX)clang *_CLANGDWARF_X64_SLINK_PATH =3D DEF(CLANGDWARF_X64_PREFIX)llvm-ar *_CLANGDWARF_X64_DLINK_PATH =3D DEF(CLANGDWARF_X64_PREFIX)clang @@ -1947,6 +1949,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS =3D DEF(CLANGDWAR= F_ARM_TARGET) DEF(GCC_ARM_DLI *_CLANGDWARF_ARM_ASL_OUTFLAGS =3D DEF(IASL_OUTFLAGS) *_CLANGDWARF_ARM_DTCPP_FLAGS =3D DEF(GCC_DTCPP_FLAGS) =20 +*_CLANGDWARF_ARM_OBJCOPY_PATH =3D ENV(CLANGDWARF_BIN)llvm-objcopy *_CLANGDWARF_ARM_CC_PATH =3D ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_ARM_ASM_PATH =3D ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_ARM_PP_PATH =3D ENV(CLANGDWARF_BIN)clang @@ -1991,6 +1994,7 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS =3D DEF(CLANGD= WARF_AARCH64_TARGET) DEF(GCC_ *_CLANGDWARF_AARCH64_ASL_OUTFLAGS =3D DEF(IASL_OUTFLAGS) *_CLANGDWARF_AARCH64_DTCPP_FLAGS =3D DEF(GCC_DTCPP_FLAGS) =20 +*_CLANGDWARF_AARCH64_OBJCOPY_PATH =3D ENV(CLANGDWARF_BIN)llvm-objcopy *_CLANGDWARF_AARCH64_CC_PATH =3D ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_AARCH64_ASM_PATH =3D ENV(CLANGDWARF_BIN)clang *_CLANGDWARF_AARCH64_PP_PATH =3D ENV(CLANGDWARF_BIN)clang --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104440): https://edk2.groups.io/g/devel/message/104440 Mute This Topic: https://groups.io/mt/98796313/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 05:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104441+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104441+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683676431; cv=none; d=zohomail.com; s=zohoarc; b=lT7ZrA3/06VHN9P+LAKFdlrO1C2cfJG3cn2CwSLTxBUEXt1GcddkUbHUFf7A+6BMAdFFGc+/3ZGaaPYoDuvIYlaTt0M8Z71vRcIoaXIaYhFZHkHyVJPGww73B0ZhLZiO911Y8hA1iLrzEveByFmrSEhJDNZWD1xzFCT65M86whI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683676431; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=bHTJ57aXqNG/4qROZkcvkFqemqaA2GAWiO0d9vsG6ko=; b=OsCEN4B1t0YU7d7lWFx2UNVkqW+ZHt730f7sD7hslHmGgPm0bJoUeyW3XVsXH7ew1jmDBw7fIvTTniH1VEV7y32FF0NI9FU3r5ThvuFf1D2qQ2v7X70cDHX7eRnHFcIkXey8tjgPSDvODnN4L96a1sybjb4IjTNAzRjABSrG8nk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104441+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683676431504785.9428724221527; Tue, 9 May 2023 16:53:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id xTahYY1788612xDB6eckRGoi; Tue, 09 May 2023 16:53:51 -0700 X-Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mx.groups.io with SMTP id smtpd.web10.4600.1683676430555717842 for ; Tue, 09 May 2023 16:53:50 -0700 X-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id BA8873200903; Tue, 9 May 2023 19:53:49 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 09 May 2023 19:53:50 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeegvddgvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 19:53:48 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [edk2-stable202305 PATCH 3/4] BaseTools: Set CLANGDWARF RC path to llvm-objcopy in tools_def.template Date: Tue, 9 May 2023 17:53:36 -0600 Message-Id: <20230509235337.1815842-4-rebecca@bsdio.com> In-Reply-To: <20230509235337.1815842-1-rebecca@bsdio.com> References: <20230509235337.1815842-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: dmQzLbFsKpWgjNfnfElAtWeMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683676431; bh=JZSwZoaxShsVOdb/igMoiSGoa2IBzkRn64UEklyzg0I=; h=Cc:Date:From:Reply-To:Subject:To; b=I86DRZP3G3rEjucn+fDsuDHLZK+AmPbFeSbI/iNHcbR7h//FLR96JxkXgGB6djvvGU9 wfJX8PDgICk5+dboqOJxtuvUT5ESMMJ2YAFmLmeQAl6T6wuQvSbJLYnJXiTXRGqYqZwtg Qlw7gffBFQ3/xCPYNnbrVAdMAg0WE0+yD9g= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683676432956100007 Content-Type: text/plain; charset="utf-8" The llvm-rc tool is for Windows PE resources. Since the CLANGDWARF toolchain creates ELF binaries, update the RC path to be llvm-objcopy. This follows the GCC toolchain which uses objcopy for the RC path. Signed-off-by: Rebecca Cran --- BaseTools/Conf/tools_def.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 96a413c4ca79..b3c822f0bc20 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1874,7 +1874,7 @@ DEFINE CLANGDWARF_ALL_CC_FLAGS =3D DEF(GCC48_= ALL_CC_FLAGS) DEF(CLANGDWARF_ *_CLANGDWARF_IA32_VFRPP_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)clang *_CLANGDWARF_IA32_ASLCC_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)clang *_CLANGDWARF_IA32_ASLPP_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)clang -*_CLANGDWARF_IA32_RC_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)llvm= -rc +*_CLANGDWARF_IA32_RC_PATH =3D DEF(CLANGDWARF_IA32_PREFIX)llvm= -objcopy =20 *_CLANGDWARF_IA32_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -m32 -fno-= lto DEF(CLANGDWARF_IA32_TARGET) *_CLANGDWARF_IA32_ASLDLINK_FLAGS =3D DEF(CLANGDWARF_IA32_X64_ASLDLIN= K_FLAGS) -Wl,-m,elf_i386 -fuse-ld=3Dlld -no-pie @@ -1911,7 +1911,7 @@ NOOPT_CLANGDWARF_IA32_DLINK2_FLAGS =3D DEF(CLANGD= WARF_IA32_DLINK2_FLAGS) -O0 - *_CLANGDWARF_X64_VFRPP_PATH =3D DEF(CLANGDWARF_X64_PREFIX)clang *_CLANGDWARF_X64_ASLCC_PATH =3D DEF(CLANGDWARF_X64_PREFIX)clang *_CLANGDWARF_X64_ASLPP_PATH =3D DEF(CLANGDWARF_X64_PREFIX)clang -*_CLANGDWARF_X64_RC_PATH =3D DEF(CLANGDWARF_X64_PREFIX)llvm-rc +*_CLANGDWARF_X64_RC_PATH =3D DEF(CLANGDWARF_X64_PREFIX)llvm-o= bjcopy =20 *_CLANGDWARF_X64_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -m64 -fno-l= to DEF(CLANGDWARF_X64_TARGET) *_CLANGDWARF_X64_ASLDLINK_FLAGS =3D DEF(CLANGDWARF_IA32_X64_ASLDLINK= _FLAGS) -Wl,-m,elf_x86_64 -fuse-ld=3Dlld @@ -1960,7 +1960,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS =3D DEF(CLANGDWAR= F_ARM_TARGET) DEF(GCC_ARM_DLI *_CLANGDWARF_ARM_ASLDLINK_PATH =3D ENV(CLANGDWARF_BIN)clang =20 *_CLANGDWARF_ARM_SLINK_PATH =3D ENV(CLANGDWARF_BIN)llvm-ar -*_CLANGDWARF_ARM_RC_PATH =3D ENV(CLANGDWARF_ARM_PREFIX)objcopy +*_CLANGDWARF_ARM_RC_PATH =3D ENV(CLANGDWARF_ARM_PREFIX)llvm-obj= copy =20 *_CLANGDWARF_ARM_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -fno-lto *_CLANGDWARF_ARM_ASLDLINK_FLAGS =3D DEF(CLANGDWARF_ARM_TARGET) DEF(GCC= _ARM_ASLDLINK_FLAGS) @@ -2005,7 +2005,7 @@ DEFINE CLANGDWARF_AARCH64_DLINK_FLAGS =3D DEF(CLANGD= WARF_AARCH64_TARGET) DEF(GCC_ *_CLANGDWARF_AARCH64_ASLDLINK_PATH =3D ENV(CLANGDWARF_BIN)clang =20 *_CLANGDWARF_AARCH64_SLINK_PATH =3D ENV(CLANGDWARF_BIN)llvm-ar -*_CLANGDWARF_AARCH64_RC_PATH =3D ENV(CLANGDWARF_AARCH64_PREFIX)objc= opy +*_CLANGDWARF_AARCH64_RC_PATH =3D ENV(CLANGDWARF_BIN)llvm-objcopy =20 *_CLANGDWARF_AARCH64_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -fno-lto *_CLANGDWARF_AARCH64_ASLDLINK_FLAGS =3D DEF(CLANGDWARF_AARCH64_TARGET) DEF= (GCC_AARCH64_ASLDLINK_FLAGS) --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104441): https://edk2.groups.io/g/devel/message/104441 Mute This Topic: https://groups.io/mt/98796314/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 05:50:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104442+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104442+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683676433; cv=none; d=zohomail.com; s=zohoarc; b=fqVvIhIQNf7nskoj0RBTw1kl6v4EyAKp3X5E8mmD0lPcErS2d3bv6vuyA9bi74jl8m1HBdGVgxvhcdWnX8xJI4OKaKKBSvRc0LA6jt8mp2z/4+JCR7EFO1fuxhBj0m7o424YQb4ZXTEmf97z1oX/DI9/v6oV30LHmY2xA5SSUlk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683676433; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=vMKaEMKSeNOQKBJ9Cfig39ssv/VpjUWNrJcj2OYqUkA=; b=mAVQSgxiBbCqYpii/IBeRI+/CjRT/3KK1w0uuUHzeTmz7V9UZc1PNW8xsqRiEbcDtWsYKMgQSpzTxAcHYDldykckl54BpEVctIJXPLbWzGnU7d8+5t+yZ4ksKd+ujs7DrxOHrr9rZSoVg89NhgBOyMCAjqmujLWAeaHDcdbNXIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104442+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683676433036833.183872589534; Tue, 9 May 2023 16:53:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id znUYYY1788612xd9tWKbX1Bf; Tue, 09 May 2023 16:53:52 -0700 X-Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by mx.groups.io with SMTP id smtpd.web10.4602.1683676432333492405 for ; Tue, 09 May 2023 16:53:52 -0700 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 82C1F320095E; Tue, 9 May 2023 19:53:51 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 09 May 2023 19:53:51 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeegvddgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 May 2023 19:53:50 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [edk2-stable202305 PATCH 4/4] BaseTools: Remove the CLANGCC build rule for Hii-Binary-Package.UEFI_HII Date: Tue, 9 May 2023 17:53:37 -0600 Message-Id: <20230509235337.1815842-5-rebecca@bsdio.com> In-Reply-To: <20230509235337.1815842-1-rebecca@bsdio.com> References: <20230509235337.1815842-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: D5UPVP5SBKaXAH7QBBtrdp1ix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683676432; bh=309uJ8N61XgRnpn2vU91/K1KpdfoIDjiL4orsmsNC+s=; h=Cc:Date:From:Reply-To:Subject:To; b=nbck7ZBegpMjhVWa+a+Nyy8GsFCDZ4WbTHW8CNqr/A/FyN1q2rYCx1lnUcAnLS80sAY 4tZCAnwgAR/zVwlvipbytdp3YnCZID8RnkfhDXj/cT7JDbeG1S81d3goLEdZOLvoPkw6l XeFljFfqDIHr839pyYI+E+vPPMlhkYrjsh8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683676434931100011 Content-Type: text/plain; charset="utf-8" The build rule for Hii-Binary-Package.UEFI_HII should be the same as for GCC, using $(RC) to embed the HII resource into the binary. Since the build rule defaults to GCC, just remove CLANGGCC from the section. Signed-off-by: Rebecca Cran --- BaseTools/Conf/build_rule.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index eb64c62060e1..041146124e87 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -646,5 +646,5 @@ "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} - + "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104442): https://edk2.groups.io/g/devel/message/104442 Mute This Topic: https://groups.io/mt/98796315/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-