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.13689.1683716594964272504 for ; Wed, 10 May 2023 04:03:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pl/mVldu; 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 4BACF62EA7 for ; Wed, 10 May 2023 11:03:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CB57C4339C for ; Wed, 10 May 2023 11:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683716593; bh=5QLWj1Y3QsLhHvfQH7y5QAO5Z4nJ/xSIUq7nkNjnK3s=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=pl/mVldutOE6ZkdENvBInjC57ZvFYJy0FmA+cyTXsSuvB3dNDcHMn7GeB6/fBSmO2 /F4W7eYM/Ns3vdc1ism1GVpACHbQKGV/CwFfPxf5Tt+ZAQEZPq9mSSONPtUlE0xHF1 7Plg84JgCJDaB77SEjLz3uurUgCGsf/rA0lJ5OtJsO/s24QleUv9tOFNypRg9/lmNg pwMHUWoulNl79X/UNH+agsVAVO/Ghbo6fXbGKbr62+hKJwkxO1pWvp8Vu8jH0POCv1 WnuQBFNW9LCH1yM6EwG8Sgs0yiGRhBF22FsP9UAAYHNjLNs0NeRHe2ek9NVl02NFF7 9aOMY0fiqoK3w== Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-4efe8991b8aso8159423e87.0 for ; Wed, 10 May 2023 04:03:13 -0700 (PDT) X-Gm-Message-State: AC+VfDz4/DhNvQyLuAqv41uT8zcb/Y2dSIsY3PaiEgg4SWh+JrMCtmps WS+o8MrRuYW+/vx6/KtbtiiWdz/PoCM+HH+GiDI= X-Google-Smtp-Source: ACHHUZ7tgdP6xSLrU/gwrLdg9EtPuesLVSn5eMvF70w3ocVa5Rcr7ufWQmo63AvCahJT6D7OpJ6vvnaWcDbdk+4axUw= X-Received: by 2002:a2e:b16c:0:b0:2a8:dce8:2d13 with SMTP id a12-20020a2eb16c000000b002a8dce82d13mr1816382ljm.14.1683716591559; Wed, 10 May 2023 04:03:11 -0700 (PDT) MIME-Version: 1.0 References: <20230509235337.1815842-1-rebecca@bsdio.com> <20230509235337.1815842-3-rebecca@bsdio.com> In-Reply-To: <20230509235337.1815842-3-rebecca@bsdio.com> From: "Ard Biesheuvel" Date: Wed, 10 May 2023 13:03:00 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [edk2-stable202305 PATCH 2/4] BaseTools: Set the CLANGDWARF OBJCOPY path in tools_def.template To: devel@edk2.groups.io, rebecca@bsdio.com Cc: Liming Gao , Bob Feng , Yuwei Chen Content-Type: text/plain; charset="UTF-8" On Wed, 10 May 2023 at 01:53, Rebecca Cran wrote: > > Set the OBJCOPY path for the CLANGDWARF toolchain to 'llvm-objcopy' to > override the default of 'echo'. > > Signed-off-by: Rebecca Cran This appears to break the AArch64 CLANGDWARF build. https://ci.linaro.org/job/leg-virt-tianocore-edk2-upstream/4880/console > --- > BaseTools/Conf/tools_def.template | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template > 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 = 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 > @@ -1900,6 +1901,7 @@ 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 > @@ -1947,6 +1949,7 @@ 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 > @@ -1991,6 +1994,7 @@ 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 > > > > > >