]>
Commit | Line | Data |
---|---|---|
1b6047b3 AF |
1 | From f1217c803cec90813eb834dde7829f4961b2a2e4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | |
3 | Date: Thu, 17 Feb 2022 15:07:02 -0800 | |
4 | Subject: [PATCH] configure.ac: Use _zicsr_zifencei extentions on riscv | |
5 | ||
6 | From version 2.38, binutils defaults to ISA spec version 20191213. This | |
7 | means that the csr read/write (csrr*/csrw*) instructions and fence.i | |
8 | instruction has separated from the `I` extension, become two standalone | |
9 | extensions: Zicsr and Zifencei. | |
10 | ||
11 | The fix is to specify those extensions explicitely in -march. Since we | |
12 | are now using binutils 2.38+ in OE this is ok, a more upstreamable fix for | |
13 | grub will be to detect these extentions, however thats not easy to | |
14 | implement | |
15 | ||
16 | Upstream-Status: Inappropriate [OE specific] | |
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | |
18 | --- | |
19 | configure.ac | 8 ++++---- | |
20 | 1 file changed, 4 insertions(+), 4 deletions(-) | |
21 | ||
22 | diff --git a/configure.ac b/configure.ac | |
23 | index c7fc55a..072f2c9 100644 | |
24 | --- a/configure.ac | |
25 | +++ b/configure.ac | |
26 | @@ -849,14 +849,14 @@ if test x"$platform" != xemu ; then | |
27 | [grub_cv_target_cc_soft_float="-mgeneral-regs-only"], []) | |
28 | fi | |
29 | if test "x$target_cpu" = xriscv32; then | |
30 | - CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror" | |
31 | + CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror" | |
32 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], | |
33 | - [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], []) | |
34 | + [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], []) | |
35 | fi | |
36 | if test "x$target_cpu" = xriscv64; then | |
37 | - CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror" | |
38 | + CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror" | |
39 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], | |
40 | - [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], []) | |
41 | + [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], []) | |
42 | fi | |
43 | if test "x$target_cpu" = xia64; then | |
44 | CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror" | |
45 | -- | |
46 | 2.35.1 | |
47 |