forked from pool/grub2
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
|
From 4e7de0959f3e99824d4a688398958ea022a1d023 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
|
||
|
|
Date: Sat, 29 Jan 2022 13:36:55 +0100
|
||
|
|
Subject: [PATCH] RISC-V: Adjust -march flags for binutils 2.38
|
||
|
|
|
||
|
|
As of version 2.38 binutils defaults to ISA specification version
|
||
|
|
2019-12-13. This version of the specification has has separated the
|
||
|
|
the csr read/write (csrr*/csrw*) instructions and the fence.i from
|
||
|
|
the I extension and put them into separate Zicsr and Zifencei
|
||
|
|
extensions.
|
||
|
|
|
||
|
|
This implies that we have to adjust the -march flag passed to the
|
||
|
|
compiler accordingly.
|
||
|
|
|
||
|
|
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
---
|
||
|
|
configure.ac | 8 ++++++++
|
||
|
|
1 file changed, 8 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index af8e2615ce..906eb1cedc 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -866,11 +866,19 @@ if test x"$platform" != xemu ; then
|
||
|
|
CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror"
|
||
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
||
|
|
[grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], [])
|
||
|
|
+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
|
||
|
|
+ CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror"
|
||
|
|
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
||
|
|
+ [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], [])
|
||
|
|
fi
|
||
|
|
if test "x$target_cpu" = xriscv64; then
|
||
|
|
CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror"
|
||
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
||
|
|
[grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], [])
|
||
|
|
+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
|
||
|
|
+ CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror"
|
||
|
|
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
|
||
|
|
+ [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], [])
|
||
|
|
fi
|
||
|
|
if test "x$target_cpu" = xia64; then
|
||
|
|
CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror"
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|