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.16650.1672934710401717421 for ; Thu, 05 Jan 2023 08:05:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R2kPnoN6; 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 F0D9F61B13; Thu, 5 Jan 2023 16:05:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1B2EC433F2; Thu, 5 Jan 2023 16:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672934709; bh=Bc+hP0rgdDwa4KEm2sSrqKflGLu6yV2EZaaTF40/92g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R2kPnoN6TZs9cO/Zgo+EVKlRU5wj6I84XK5oqR+lmb8g9BYSG5wv7hCmDr9RnQYNe tJSHLiGrFlsGbXExadhnGROKS9bTW44uObGIqZXO3L+WzZy9DBAMiZM2NI2D4dD4it TiB99L05SVpqc6tCJJgSvLZKpMJv+zBQDmNNR9XXEmoSEvk7VzIfED4cYWtxgrryxN 6AYk2g8lnz8GuPFyD1rn7p4UFnHdHkhWZDN7uMQtWuAWGzF1xTda6CgkeD6775ZJbR 2kGX6uxgJbjoa3pozxRZoBv2ML4IkrJ6mj4aiGLp2WCe3jOo925ufAIsuZtuhQAHAP isMdtfqI61HnQ== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, rebecca@quicinc.com, bob.c.feng@intel.com, gaoliming@byosoft.com.cn, Ard Biesheuvel , Abner Chang Subject: [PATCH 1/4] BaseTools/tools_def RISCV: Make OpenSBI references RISCV-only Date: Thu, 5 Jan 2023 17:05:00 +0100 Message-Id: <20230105160503.1423627-2-ardb@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105160503.1423627-1-ardb@kernel.org> References: <20230105160503.1423627-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable The global GCC_PP_FLAGS tools_def variable now contains a reference to OpenSBI specific C preprocessor variables, which means they are added to the command line on every architecture, not just RISC-V. This does not currently result in any issues, but it is a bit sloppy so let's clean this up. Given that the GCC_PP_FLAGS definition appears twice, drop the one that carries the OpenSBI reference, and move that reference to a new RISC-V specific variable. Cc: Abner Chang Signed-off-by: Ard Biesheuvel --- BaseTools/Conf/tools_def.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 805e903b23bb..4733040e3ef1 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1979,8 +1979,6 @@ DEFINE GCC5_LOONGARCH64_ASLDLINK_FLAGS =3D DEF(GC= C_LOONGARCH64_ASLDLINK_FLAGS) DEFINE GCC5_LOONGARCH64_ASM_FLAGS =3D -x assembler-with-cpp -mabi= =3Dlp64d -march=3Dloongarch64 -fno-builtin -c -Wall -mno-explicit-relocs=0D DEFINE GCC5_LOONGARCH64_PP_FLAGS =3D -mabi=3Dlp64d -march=3Dloon= garch64 DEF(GCC_PP_FLAGS)=0D =0D -DEFINE GCC_PP_FLAGS =3D -E -x assembler-with-cpp -i= nclude AutoGen.h DEF(GCC5_RISCV_OPENSBI_TYPES)=0D -=0D ##########################################################################= ##########=0D #=0D # GCC 4.8 - This configuration is used to compile under Linux to produce=0D @@ -2456,6 +2454,7 @@ RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS =3D -z common-pag= e-size=3D0x20 *_GCC5_RISCV64_RC_FLAGS =3D DEF(GCC_RISCV64_RC_FLAGS)=0D *_GCC5_RISCV64_OBJCOPY_FLAGS =3D=0D *_GCC5_RISCV64_DTCPP_FLAGS =3D DEF(GCC_DTCPP_FLAGS)=0D +*_GCC5_RISCV64_PP_FLAGS =3D DEF(GCC_PP_FLAGS) DEF(GCC5_RISCV_O= PENSBI_TYPES)=0D =0D ##################=0D # GCC5 LOONGARCH64 definitions=0D --=20 2.39.0