@@ -4,53 +4,54 @@ set(riscv_mabi "lp")
4
4
set (riscv_march "rv" )
5
5
6
6
if (CONFIG_64BIT )
7
- string (CONCAT riscv_mabi ${riscv_mabi} "64" )
8
- string (CONCAT riscv_march ${riscv_march} "64" )
9
- list (APPEND TOOLCHAIN_C_FLAGS -mcmodel=medany )
10
- list (APPEND TOOLCHAIN_LD_FLAGS -mcmodel=medany )
7
+ string (CONCAT riscv_mabi ${riscv_mabi} "64" )
8
+ string (CONCAT riscv_march ${riscv_march} "64" )
9
+ list (APPEND TOOLCHAIN_C_FLAGS -mcmodel=medany )
10
+ list (APPEND TOOLCHAIN_LD_FLAGS -mcmodel=medany )
11
11
else ()
12
- string (CONCAT riscv_mabi "i" ${riscv_mabi} "32" )
13
- string (CONCAT riscv_march ${riscv_march} "32" )
12
+ string (CONCAT riscv_mabi "i" ${riscv_mabi} "32" )
13
+ string (CONCAT riscv_march ${riscv_march} "32" )
14
14
endif ()
15
15
16
- if (CONFIG_RISCV_ISA_RV32E )
17
- string (CONCAT riscv_mabi ${riscv_mabi} "e" )
18
- string (CONCAT riscv_march ${riscv_march} "e" )
16
+ if (CONFIG_RISCV_ISA_RV32E )
17
+ string (CONCAT riscv_mabi ${riscv_mabi} "e" )
18
+ string (CONCAT riscv_march ${riscv_march} "e" )
19
19
else ()
20
- string (CONCAT riscv_march ${riscv_march} "i" )
20
+ string (CONCAT riscv_march ${riscv_march} "i" )
21
21
endif ()
22
22
23
- if (CONFIG_RISCV_ISA_EXT_M )
24
- string (CONCAT riscv_march ${riscv_march} "m" )
23
+ if (CONFIG_RISCV_ISA_EXT_M )
24
+ string (CONCAT riscv_march ${riscv_march} "m" )
25
25
endif ()
26
- if (CONFIG_RISCV_ISA_EXT_A )
27
- string (CONCAT riscv_march ${riscv_march} "a" )
26
+
27
+ if (CONFIG_RISCV_ISA_EXT_A )
28
+ string (CONCAT riscv_march ${riscv_march} "a" )
28
29
endif ()
29
30
30
31
if (CONFIG_FPU )
31
- if (CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION )
32
- if (CONFIG_FLOAT_HARD )
33
- string (CONCAT riscv_mabi ${riscv_mabi} "d" )
34
- endif ()
35
- string (CONCAT riscv_march ${riscv_march} "fd" )
36
- else ()
37
- if (CONFIG_FLOAT_HARD )
38
- string (CONCAT riscv_mabi ${riscv_mabi} "f" )
39
- endif ()
40
- string (CONCAT riscv_march ${riscv_march} "f" )
32
+ if (CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION )
33
+ if (CONFIG_FLOAT_HARD )
34
+ string (CONCAT riscv_mabi ${riscv_mabi} "d" )
35
+ endif ()
36
+ string (CONCAT riscv_march ${riscv_march} "fd" )
37
+ else ()
38
+ if (CONFIG_FLOAT_HARD )
39
+ string (CONCAT riscv_mabi ${riscv_mabi} "f" )
41
40
endif ()
41
+ string (CONCAT riscv_march ${riscv_march} "f" )
42
+ endif ()
42
43
endif ()
43
44
44
45
if (CONFIG_RISCV_ISA_EXT_C )
45
- string (CONCAT riscv_march ${riscv_march} "c" )
46
+ string (CONCAT riscv_march ${riscv_march} "c" )
46
47
endif ()
47
48
48
49
if (CONFIG_RISCV_ISA_EXT_ZICSR )
49
- string (CONCAT riscv_march ${riscv_march} "_zicsr" )
50
+ string (CONCAT riscv_march ${riscv_march} "_zicsr" )
50
51
endif ()
51
52
52
53
if (CONFIG_RISCV_ISA_EXT_ZIFENCEI )
53
- string (CONCAT riscv_march ${riscv_march} "_zifencei" )
54
+ string (CONCAT riscv_march ${riscv_march} "_zifencei" )
54
55
endif ()
55
56
56
57
# Check whether we already imply Zaamo/Zlrsc by selecting the A extension; if not - check them
@@ -66,26 +67,26 @@ if(NOT CONFIG_RISCV_ISA_EXT_A)
66
67
endif ()
67
68
68
69
if (CONFIG_RISCV_ISA_EXT_ZBA )
69
- string (CONCAT riscv_march ${riscv_march} "_zba" )
70
+ string (CONCAT riscv_march ${riscv_march} "_zba" )
70
71
endif ()
71
72
72
73
if (CONFIG_RISCV_ISA_EXT_ZBB )
73
- string (CONCAT riscv_march ${riscv_march} "_zbb" )
74
+ string (CONCAT riscv_march ${riscv_march} "_zbb" )
74
75
endif ()
75
76
76
77
if (CONFIG_RISCV_ISA_EXT_ZBC )
77
- string (CONCAT riscv_march ${riscv_march} "_zbc" )
78
+ string (CONCAT riscv_march ${riscv_march} "_zbc" )
78
79
endif ()
79
80
80
81
if (CONFIG_RISCV_ISA_EXT_ZBS )
81
- string (CONCAT riscv_march ${riscv_march} "_zbs" )
82
+ string (CONCAT riscv_march ${riscv_march} "_zbs" )
82
83
endif ()
83
84
84
85
# Check whether we already imply Zmmul by selecting the M extension; if not - enable it
85
86
if (NOT CONFIG_RISCV_ISA_EXT_M AND
86
87
CONFIG_RISCV_ISA_EXT_ZMMUL AND
87
88
"${GCC_COMPILER_VERSION} " VERSION_GREATER_EQUAL 13.0.0 )
88
- string (CONCAT riscv_march ${riscv_march} "_zmmul" )
89
+ string (CONCAT riscv_march ${riscv_march} "_zmmul" )
89
90
endif ()
90
91
91
92
list (APPEND TOOLCHAIN_C_FLAGS -mabi=${riscv_mabi} -march=${riscv_march} )
@@ -100,7 +101,7 @@ set(LLEXT_REMOVE_FLAGS
100
101
-fdata-sections
101
102
-g.*
102
103
-Os
103
- )
104
+ )
104
105
105
106
# Flags to be added to llext code compilation
106
107
# mno-relax is needed to stop gcc from generating R_RISCV_ALIGN relocations,
@@ -113,4 +114,4 @@ set(LLEXT_APPEND_FLAGS
113
114
-march=${riscv_march}
114
115
-mno-relax
115
116
-msmall-data-limit=0
116
- )
117
+ )
0 commit comments