1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH 0/4] BaseTools - various cleanups
  4. View patch

[edk2-devel] [PATCH 1/4] BaseTools/tools_def RISCV: Make OpenSBI references RISCV-only

Ard Biesheuvel posted 4 patches 3 years, 1 month ago
[edk2-devel] [PATCH 1/4] BaseTools/tools_def RISCV: Make OpenSBI references RISCV-only
Posted by Ard Biesheuvel 3 years, 1 month ago 
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 <abner.chang@amd.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 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.template
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     = DEF(GCC_LOONGARCH64_ASLDLINK_FLAGS)
 DEFINE GCC5_LOONGARCH64_ASM_FLAGS          = -x assembler-with-cpp -mabi=lp64d -march=loongarch64 -fno-builtin -c -Wall -mno-explicit-relocs
 DEFINE GCC5_LOONGARCH64_PP_FLAGS           = -mabi=lp64d -march=loongarch64 DEF(GCC_PP_FLAGS)
 
-DEFINE GCC_PP_FLAGS                        = -E -x assembler-with-cpp -include AutoGen.h DEF(GCC5_RISCV_OPENSBI_TYPES)
-
 ####################################################################################
 #
 # GCC 4.8 - This configuration is used to compile under Linux to produce
@@ -2456,6 +2454,7 @@ RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
 *_GCC5_RISCV64_RC_FLAGS             = DEF(GCC_RISCV64_RC_FLAGS)
 *_GCC5_RISCV64_OBJCOPY_FLAGS        =
 *_GCC5_RISCV64_DTCPP_FLAGS          = DEF(GCC_DTCPP_FLAGS)
+*_GCC5_RISCV64_PP_FLAGS             = DEF(GCC_PP_FLAGS) DEF(GCC5_RISCV_OPENSBI_TYPES)
 
 ##################
 # GCC5 LOONGARCH64 definitions
-- 
2.39.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#98016): https://edk2.groups.io/g/devel/message/98016
Mute This Topic: https://groups.io/mt/96074676/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/4] BaseTools/tools_def RISCV: Make OpenSBI references RISCV-only
Posted by Chang, Abner via groups.io 3 years, 1 month ago 
[AMD Official Use Only - General]

Acked-by: Abner Chang <abner.chang@amd.com>

Add Sunil to review this.

> -----Original Message-----
> From: Ard Biesheuvel <ardb@kernel.org>
> Sent: Friday, January 6, 2023 12:05 AM
> To: devel@edk2.groups.io
> Cc: quic_llindhol@quicinc.com; rebecca@quicinc.com; bob.c.feng@intel.com;
> gaoliming@byosoft.com.cn; Ard Biesheuvel <ardb@kernel.org>; Chang,
> Abner <Abner.Chang@amd.com>
> Subject: [PATCH 1/4] BaseTools/tools_def RISCV: Make OpenSBI references
> RISCV-only
> 
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
> 
> 
> 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 <abner.chang@amd.com>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>  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.template
> 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
> = DEF(GCC_LOONGARCH64_ASLDLINK_FLAGS)
>  DEFINE GCC5_LOONGARCH64_ASM_FLAGS          = -x assembler-with-cpp -
> mabi=lp64d -march=loongarch64 -fno-builtin -c -Wall -mno-explicit-relocs
> 
>  DEFINE GCC5_LOONGARCH64_PP_FLAGS           = -mabi=lp64d -
> march=loongarch64 DEF(GCC_PP_FLAGS)
> 
> 
> 
> -DEFINE GCC_PP_FLAGS                        = -E -x assembler-with-cpp -include
> AutoGen.h DEF(GCC5_RISCV_OPENSBI_TYPES)
> 
> -
> 
> 
> ##########################################################
> ##########################
> 
>  #
> 
>  # GCC 4.8 - This configuration is used to compile under Linux to produce
> 
> @@ -2456,6 +2454,7 @@ RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS = -z
> common-page-size=0x20
>  *_GCC5_RISCV64_RC_FLAGS             = DEF(GCC_RISCV64_RC_FLAGS)
> 
>  *_GCC5_RISCV64_OBJCOPY_FLAGS        =
> 
>  *_GCC5_RISCV64_DTCPP_FLAGS          = DEF(GCC_DTCPP_FLAGS)
> 
> +*_GCC5_RISCV64_PP_FLAGS             = DEF(GCC_PP_FLAGS)
> DEF(GCC5_RISCV_OPENSBI_TYPES)
> 
> 
> 
>  ##################
> 
>  # GCC5 LOONGARCH64 definitions
> 
> --
> 2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#98021): https://edk2.groups.io/g/devel/message/98021
Mute This Topic: https://groups.io/mt/96074676/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/4] BaseTools/tools_def RISCV: Make OpenSBI references RISCV-only
Posted by Sunil V L 3 years, 1 month ago 
Hi Ard,

Thank you very much for finding this issue and fixing it.

Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

On Thu, Jan 05, 2023 at 04:09:46PM +0000, Chang, Abner wrote:
> [AMD Official Use Only - General]
> 
> Acked-by: Abner Chang <abner.chang@amd.com>
> 
> Add Sunil to review this.
> 
> > -----Original Message-----
> > From: Ard Biesheuvel <ardb@kernel.org>
> > Sent: Friday, January 6, 2023 12:05 AM
> > To: devel@edk2.groups.io
> > Cc: quic_llindhol@quicinc.com; rebecca@quicinc.com; bob.c.feng@intel.com;
> > gaoliming@byosoft.com.cn; Ard Biesheuvel <ardb@kernel.org>; Chang,
> > Abner <Abner.Chang@amd.com>
> > Subject: [PATCH 1/4] BaseTools/tools_def RISCV: Make OpenSBI references
> > RISCV-only
> > 
> > Caution: This message originated from an External Source. Use proper
> > caution when opening attachments, clicking links, or responding.
> > 
> > 
> > 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 <abner.chang@amd.com>
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > ---
> >  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.template
> > 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
> > = DEF(GCC_LOONGARCH64_ASLDLINK_FLAGS)
> >  DEFINE GCC5_LOONGARCH64_ASM_FLAGS          = -x assembler-with-cpp -
> > mabi=lp64d -march=loongarch64 -fno-builtin -c -Wall -mno-explicit-relocs
> > 
> >  DEFINE GCC5_LOONGARCH64_PP_FLAGS           = -mabi=lp64d -
> > march=loongarch64 DEF(GCC_PP_FLAGS)
> > 
> > 
> > 
> > -DEFINE GCC_PP_FLAGS                        = -E -x assembler-with-cpp -include
> > AutoGen.h DEF(GCC5_RISCV_OPENSBI_TYPES)
> > 
> > -
> > 
> > 
> > ##########################################################
> > ##########################
> > 
> >  #
> > 
> >  # GCC 4.8 - This configuration is used to compile under Linux to produce
> > 
> > @@ -2456,6 +2454,7 @@ RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS = -z
> > common-page-size=0x20
> >  *_GCC5_RISCV64_RC_FLAGS             = DEF(GCC_RISCV64_RC_FLAGS)
> > 
> >  *_GCC5_RISCV64_OBJCOPY_FLAGS        =
> > 
> >  *_GCC5_RISCV64_DTCPP_FLAGS          = DEF(GCC_DTCPP_FLAGS)
> > 
> > +*_GCC5_RISCV64_PP_FLAGS             = DEF(GCC_PP_FLAGS)
> > DEF(GCC5_RISCV_OPENSBI_TYPES)
> > 
> > 
> > 
> >  ##################
> > 
> >  # GCC5 LOONGARCH64 definitions
> > 
> > --
> > 2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#98171): https://edk2.groups.io/g/devel/message/98171
Mute This Topic: https://groups.io/mt/96074676/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.