From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242]) by mx.groups.io with SMTP id smtpd.web11.14214.1683855826000243521 for ; Thu, 11 May 2023 18:43:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=nS71wr2y; spf=pass (domain: byosoft.com.cn, ip: 101.227.64.242, mailfrom: gaoliming@byosoft.com.cn) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id AD4EACD1F725 for ; Fri, 12 May 2023 09:43:41 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn; s=cloud-union; t=1683855821; bh=tzkkDBzzVmpf2a8n8O+1Cfk4xCUckvboB+4KbN9CN9c=; h=From:To:Cc:References:In-Reply-To:Subject:Date; b=nS71wr2yK3SUOdfQDSGq3id/L+OPa0RrFSmIs0tCAvUm5Lnx0hAcmfv0t1jUK9TrL MxVTLl/9F52gIpywU3rnpEmTym/J4JzRGaU/WcxoLkHqUwRpzyVRH915u5uPgu2oq3 ZtqQD5wmO1+3DchroLqpWb9nrWqL8ezV7nA4cNjc= Received: from localhost (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id A927ECD1F726 for ; Fri, 12 May 2023 09:43:41 +0800 (CST) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id 7ADAACD1F6F0 for ; Fri, 12 May 2023 09:43:41 +0800 (CST) Authentication-Results: walk.intel-email.com; none Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by walk.intel-email.com (Postfix) with SMTP id 0BB7ACD1F6A7 for ; Fri, 12 May 2023 09:43:38 +0800 (CST) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Fri, 12 May 2023 09:43:28 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Ard Biesheuvel'" , Cc: "'Rebecca Cran'" References: <20230511065940.3178891-1-ardb@kernel.org> In-Reply-To: <20230511065940.3178891-1-ardb@kernel.org> Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0hdIEJhc2VUb29scy90b29sc19kZWY6IERyb3AgcmVmIHRvIHVuZGVmaW5lZCBDTEFOR0RXQVJGX0FSTV9QUkVGSVg=?= Date: Fri, 12 May 2023 09:43:33 +0800 Message-ID: <020601d98473$2966d1d0$7c347570$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQI1W5V/a6BPzjXHD0vSoY7TGG7h5q6eLvjw Sender: "gaoliming" Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Ard:=20 This change is good to me. Reviewed-by: Liming Gao =20 Will it be merged for this stable tag? Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Ard Biesheuvel > =B7=A2=CB=CD=CA=B1=BC=E4: 2023=C4=EA5=D4=C211=C8=D5 15:00 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > =B3=AD=CB=CD: Ard Biesheuvel ; Rebecca Cran > ; Liming Gao > =D6=F7=CC=E2: [PATCH] BaseTools/tools_def: Drop ref to undefined > CLANGDWARF_ARM_PREFIX >=20 > When using CLANGDWARF to build for the ARM architecture, objcopy is >=20 > references via the wrong environment variable, resulting in the wrong >=20 > llvm-objcopy to be used (if one exists), or the build to fail (if >=20 > CLANGDWARF_BIN points to the only available instance) >=20 >=20 >=20 > So use CLANGDWARF_BIN instead, which was what was intended. >=20 >=20 >=20 > Cc: Rebecca Cran >=20 > Cc: Liming Gao >=20 > Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...") >=20 > Signed-off-by: Ard Biesheuvel >=20 > --- >=20 > BaseTools/Conf/tools_def.template | 2 +- >=20 > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 >=20 >=20 > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template >=20 > index 4ae21b85a8571f93..503a6687c1f03f56 100755 >=20 > --- a/BaseTools/Conf/tools_def.template >=20 > +++ b/BaseTools/Conf/tools_def.template >=20 > @@ -1957,7 +1957,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS =3D > DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI >=20 > *_CLANGDWARF_ARM_ASLDLINK_PATH =3D > ENV(CLANGDWARF_BIN)clang >=20 >=20 >=20 >=20 >=20 > *_CLANGDWARF_ARM_SLINK_PATH =3D > ENV(CLANGDWARF_BIN)llvm-ar >=20 >=20 > -*_CLANGDWARF_ARM_RC_PATH =3D > ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy >=20 >=20 > +*_CLANGDWARF_ARM_RC_PATH =3D > ENV(CLANGDWARF_BIN)llvm-objcopy >=20 >=20 >=20 >=20 >=20 > *_CLANGDWARF_ARM_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) > -fno-lto >=20 >=20 > *_CLANGDWARF_ARM_ASLDLINK_FLAGS =3D > DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_ASLDLINK_FLAGS) >=20 >=20 > -- >=20 > 2.39.2 >=20 >=20