@@ -12,26 +12,26 @@ elseif(CONFIG_RISCV_CMODEL_LARGE)
1212endif ()
1313
1414if (CONFIG_64BIT)
15- string (CONCAT riscv_mabi ${riscv_mabi} "64" )
16- string (CONCAT riscv_march ${riscv_march} "64" )
15+ string (APPEND riscv_mabi "64" )
16+ string (APPEND riscv_march "64" )
1717else ()
1818 string (CONCAT riscv_mabi "i" ${riscv_mabi} "32" )
19- string (CONCAT riscv_march ${riscv_march} "32" )
19+ string (APPEND riscv_march "32" )
2020endif ()
2121
2222if (CONFIG_RISCV_ISA_RV32E)
23- string (CONCAT riscv_mabi ${riscv_mabi} "e" )
24- string (CONCAT riscv_march ${riscv_march} "e" )
23+ string (APPEND riscv_mabi "e" )
24+ string (APPEND riscv_march "e" )
2525else ()
26- string (CONCAT riscv_march ${riscv_march} "i" )
26+ string (APPEND riscv_march "i" )
2727endif ()
2828
2929if (CONFIG_RISCV_ISA_EXT_M)
30- string (CONCAT riscv_march ${riscv_march} "m" )
30+ string (APPEND riscv_march "m" )
3131endif ()
3232
3333if (CONFIG_RISCV_ISA_EXT_A)
34- string (CONCAT riscv_march ${riscv_march} "a" )
34+ string (APPEND riscv_march "a" )
3535endif ()
3636
3737if (CONFIG_FLOAT_HARD)
@@ -52,84 +52,84 @@ if(CONFIG_FPU)
5252endif ()
5353
5454if (CONFIG_RISCV_ISA_EXT_C)
55- string (CONCAT riscv_march ${riscv_march} "c" )
55+ string (APPEND riscv_march "c" )
5656endif ()
5757
5858if (CONFIG_RISCV_ISA_EXT_ZICNTR)
59- string (CONCAT riscv_march ${riscv_march} "_zicntr" )
59+ string (APPEND riscv_march "_zicntr" )
6060endif ()
6161
6262if (CONFIG_RISCV_ISA_EXT_ZICSR)
63- string (CONCAT riscv_march ${riscv_march} "_zicsr" )
63+ string (APPEND riscv_march "_zicsr" )
6464endif ()
6565
6666if (CONFIG_RISCV_ISA_EXT_ZIFENCEI)
67- string (CONCAT riscv_march ${riscv_march} "_zifencei" )
67+ string (APPEND riscv_march "_zifencei" )
6868endif ()
6969
7070# Check whether we already imply Zaamo/Zalrsc by selecting the A extension; if not - check them
7171# individually and enable them as needed
7272if (NOT CONFIG_RISCV_ISA_EXT_A)
7373 if (CONFIG_RISCV_ISA_EXT_ZAAMO)
74- string (CONCAT riscv_march ${riscv_march} "_zaamo" )
74+ string (APPEND riscv_march "_zaamo" )
7575 endif ()
7676
7777 if (CONFIG_RISCV_ISA_EXT_ZALRSC)
78- string (CONCAT riscv_march ${riscv_march} "_zalrsc" )
78+ string (APPEND riscv_march "_zalrsc" )
7979 endif ()
8080endif ()
8181
8282# Zca is implied by C
8383if (CONFIG_RISCV_ISA_EXT_ZCA AND
8484 NOT CONFIG_RISCV_ISA_EXT_C)
85- string (CONCAT riscv_march ${riscv_march} "_zca" )
85+ string (APPEND riscv_march "_zca" )
8686endif ()
8787
8888if (CONFIG_RISCV_ISA_EXT_ZCB)
89- string (CONCAT riscv_march ${riscv_march} "_zcb" )
89+ string (APPEND riscv_march "_zcb" )
9090endif ()
9191
9292# Zcd is implied by C+D
9393if (CONFIG_RISCV_ISA_EXT_ZCD AND
9494 NOT (CONFIG_RISCV_ISA_EXT_C AND CONFIG_RISCV_ISA_EXT_D))
95- string (CONCAT riscv_march ${riscv_march} "_zcd" )
95+ string (APPEND riscv_march "_zcd" )
9696endif ()
9797
9898# Zcf is implied by C+F
9999if (CONFIG_RISCV_ISA_EXT_ZCF AND
100100 NOT (CONFIG_RISCV_ISA_EXT_C AND CONFIG_RISCV_ISA_EXT_F))
101- string (CONCAT riscv_march ${riscv_march} "_zcf" )
101+ string (APPEND riscv_march "_zcf" )
102102endif ()
103103
104104if (CONFIG_RISCV_ISA_EXT_ZCMP)
105- string (CONCAT riscv_march ${riscv_march} "_zcmp" )
105+ string (APPEND riscv_march "_zcmp" )
106106endif ()
107107
108108if (CONFIG_RISCV_ISA_EXT_ZCMT)
109- string (CONCAT riscv_march ${riscv_march} "_zcmt" )
109+ string (APPEND riscv_march "_zcmt" )
110110endif ()
111111
112112if (CONFIG_RISCV_ISA_EXT_ZBA)
113- string (CONCAT riscv_march ${riscv_march} "_zba" )
113+ string (APPEND riscv_march "_zba" )
114114endif ()
115115
116116if (CONFIG_RISCV_ISA_EXT_ZBB)
117- string (CONCAT riscv_march ${riscv_march} "_zbb" )
117+ string (APPEND riscv_march "_zbb" )
118118endif ()
119119
120120if (CONFIG_RISCV_ISA_EXT_ZBC)
121- string (CONCAT riscv_march ${riscv_march} "_zbc" )
121+ string (APPEND riscv_march "_zbc" )
122122endif ()
123123
124124if (CONFIG_RISCV_ISA_EXT_ZBS)
125- string (CONCAT riscv_march ${riscv_march} "_zbs" )
125+ string (APPEND riscv_march "_zbs" )
126126endif ()
127127
128128# Check whether we already imply Zmmul by selecting the M extension; if not - enable it
129129if (NOT CONFIG_RISCV_ISA_EXT_M AND
130130 CONFIG_RISCV_ISA_EXT_ZMMUL AND
131131 "${GCC_COMPILER_VERSION} " VERSION_GREATER_EQUAL 13.0.0)
132- string (CONCAT riscv_march ${riscv_march} "_zmmul" )
132+ string (APPEND riscv_march "_zmmul" )
133133endif ()
134134
135135list (APPEND RISCV_C_FLAGS
0 commit comments