[PATCH 1/1] BaseTools/tools_def.template: Update -march parameter for RISC-V

[PATCH 1/1] BaseTools/tools_def.template: Update -march parameter for RISC-V

[Sunil V L]

Replace rv64imafdc with rv64gc so that it works for gcc 12.

"g" means imafd in gcc < 12 and imafd_zifencei_zicsr. So,
replacing rv64imafdc with rv64gc will work for both gcc <12
and gcc >=12.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Andrei Warkentin <andrei.warkentin@intel.com>
Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 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 f77e936c0453..471eb67c0c83 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1965,7 +1965,7 @@ DEFINE GCC5_RISCV_ALL_CC_FLAGS_WARNING_DISABLE    = -Wno-tautological-compare -W
 
 DEFINE GCC5_RISCV_OPENSBI_TYPES                   = -DOPENSBI_EXTERNAL_SBI_TYPES=OpensbiTypes.h
 
-DEFINE GCC5_RISCV64_ARCH                   = rv64imafdc
+DEFINE GCC5_RISCV64_ARCH                   = rv64gc
 DEFINE GCC5_RISCV32_RISCV64_ASLDLINK_FLAGS = DEF(GCC5_RISCV_ALL_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
 DEFINE GCC5_RISCV64_CC_FLAGS               = DEF(GCC5_RISCV_ALL_CC_FLAGS) DEF(GCC5_RISCV_ALL_CC_FLAGS_WARNING_DISABLE) DEF(GCC5_RISCV_OPENSBI_TYPES) -march=DEF(GCC5_RISCV64_ARCH) -fno-builtin -fno-builtin-memcpy -fno-stack-protector -Wno-address -fno-asynchronous-unwind-tables -Wno-unused-but-set-variable -fpack-struct=8 -mcmodel=medany -mabi=lp64 -mno-relax
 DEFINE GCC5_RISCV64_DLINK_FLAGS            = DEF(GCC5_RISCV_ALL_DLINK_FLAGS) -Wl,-melf64lriscv,--oformat=elf64-littleriscv,--no-relax
-- 
2.34.1

Re: [edk2-devel] [PATCH 1/1] BaseTools/tools_def.template: Update -march parameter for RISC-V

[Gerd Hoffmann]

On Tue, Feb 21, 2023 at 01:26:55AM +0530, Sunil V L wrote:
> Replace rv64imafdc with rv64gc so that it works for gcc 12.
> 
> "g" means imafd in gcc < 12 and imafd_zifencei_zicsr. So,
> replacing rv64imafdc with rv64gc will work for both gcc <12
> and gcc >=12.
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Andrei Warkentin <andrei.warkentin@intel.com>
> Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>

Tested-by: Gerd Hoffmann <kraxel@redhat.com>

IMHO a candiate for the 2023-02 stable tag.

take care,
  Gerd

Re: [edk2-devel] [PATCH 1/1] BaseTools/tools_def.template: Update -march parameter for RISC-V

[Andrei Warkentin]

[-- Attachment #1: Type: text/plain, Size: 60 bytes --]

Reviewed-by: Andrei Warkentin <andrei.warkentin@intel.com>

[-- Attachment #2: Type: text/html, Size: 106 bytes --]