From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web10.18050.1683873629248988718 for ; Thu, 11 May 2023 23:40:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NEjpuBjt; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BFA0C6531D for ; Fri, 12 May 2023 06:40:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DEE5C433EF for ; Fri, 12 May 2023 06:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683873628; bh=mZYwUsc3gsJKZ1mvDHbl1S6TuxkZFSaAN9o4gldBgnw=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=NEjpuBjttHt1NcFhbCMa+e5sZcSynzR1pTRs1vBi5mmdoza39r3CGWQBTdq1joUA9 ni6bq+M132CA0oN23qgK3G1b525ACyu+bwleyQCyKWoH9ZVveHC4Jf62jnECYzBkrY bZsBHiFBVyJB0tZ4PWXD9Ali5JfIeyBi0uygSKF5xQ3Lqjeo7tmDC2XTIhcpzvPYwn teUqhBT1jTBWzBEIiESWFnvglOYA0zkh1QAFAWGRycW5Ce3edeniMuUdY4ep5eQCL4 Uvksz0AL42eKy0VD7fudpoEzHnZdeEJ5HknCqllZA1bEC6hKIX6vbH0X6Rhfo7dlQF JPaVsU7MQ/HNQ== Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-4f2510b2b98so6561202e87.3 for ; Thu, 11 May 2023 23:40:28 -0700 (PDT) X-Gm-Message-State: AC+VfDzOeRQrfLw+jIOGUR5RdmNvZQfl6Q60gp8jeTEGPeQDnJFtIC6F 1e4nFcagQln7LuHMmjGwEQeQnIIFX7sA/awbLhs= X-Google-Smtp-Source: ACHHUZ7e2TE2m+1vOPQySylNUrnG2H61ClqgzAYr9OjD/K7Rqp6Wp6jxwzVOqMOzcohayR75SMLK0R8QjPjyoGd9y7c= X-Received: by 2002:ac2:4198:0:b0:4f2:40dd:e2cf with SMTP id z24-20020ac24198000000b004f240dde2cfmr3576765lfh.55.1683873626215; Thu, 11 May 2023 23:40:26 -0700 (PDT) MIME-Version: 1.0 References: <20230511065940.3178891-1-ardb@kernel.org> <020601d98473$2966d1d0$7c347570$@byosoft.com.cn> In-Reply-To: <020601d98473$2966d1d0$7c347570$@byosoft.com.cn> From: "Ard Biesheuvel" Date: Fri, 12 May 2023 08:40:14 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: =?UTF-8?B?UmU6IFtlZGsyLWRldmVsXSDlm57lpI06IFtQQVRDSF0gQmFzZVRvb2xzL3Rvb2xzX2RlZjogRHJvcCByZWYgdG8gdW5kZWZpbmVkIENMQU5HRFdBUkZfQVJNX1BSRUZJWA==?= To: devel@edk2.groups.io, gaoliming@byosoft.com.cn Cc: Rebecca Cran Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 12 May 2023 at 03:43, gaoliming via groups.io wrote: > > Ard: > This change is good to me. Reviewed-by: Liming Gao > > > Will it be merged for this stable tag? > Yes I will merge it today. Thanks, > > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > > =E5=8F=91=E4=BB=B6=E4=BA=BA: Ard Biesheuvel > > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2023=E5=B9=B45=E6=9C=8811=E6=97= =A5 15:00 > > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io > > =E6=8A=84=E9=80=81: Ard Biesheuvel ; Rebecca Cran > > ; Liming Gao > > =E4=B8=BB=E9=A2=98: [PATCH] BaseTools/tools_def: Drop ref to undefined > > CLANGDWARF_ARM_PREFIX > > > > When using CLANGDWARF to build for the ARM architecture, objcopy is > > > > references via the wrong environment variable, resulting in the wrong > > > > llvm-objcopy to be used (if one exists), or the build to fail (if > > > > CLANGDWARF_BIN points to the only available instance) > > > > > > > > So use CLANGDWARF_BIN instead, which was what was intended. > > > > > > > > Cc: Rebecca Cran > > > > Cc: Liming Gao > > > > Fixes: ecbc394365f50f3c ("BaseTools: Set CLANGDWARF RC path ...") > > > > Signed-off-by: Ard Biesheuvel > > > > --- > > > > 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.template > > > > index 4ae21b85a8571f93..503a6687c1f03f56 100755 > > > > --- a/BaseTools/Conf/tools_def.template > > > > +++ b/BaseTools/Conf/tools_def.template > > > > @@ -1957,7 +1957,7 @@ DEFINE CLANGDWARF_ARM_DLINK_FLAGS =3D > > DEF(CLANGDWARF_ARM_TARGET) DEF(GCC_ARM_DLI > > > > *_CLANGDWARF_ARM_ASLDLINK_PATH =3D > > ENV(CLANGDWARF_BIN)clang > > > > > > > > > > > > *_CLANGDWARF_ARM_SLINK_PATH =3D > > ENV(CLANGDWARF_BIN)llvm-ar > > > > > > -*_CLANGDWARF_ARM_RC_PATH =3D > > ENV(CLANGDWARF_ARM_PREFIX)llvm-objcopy > > > > > > +*_CLANGDWARF_ARM_RC_PATH =3D > > ENV(CLANGDWARF_BIN)llvm-objcopy > > > > > > > > > > > > *_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) > > > > > > -- > > > > 2.39.2 > > > > > > > > > >=20 > >