2 files changed, 21 insertions, 21 deletions
diff --git a/meta-vitis-tc/conf/machine/riscv-tc.conf b/meta-vitis-tc/conf/machine/riscv-tc.conf
index 0a6c6d08..89ee39a2 100644
--- a/meta-vitis-tc/conf/machine/riscv-tc.conf
+++ b/meta-vitis-tc/conf/machine/riscv-tc.conf
@@ -38,23 +38,23 @@ TUNE_ARCH:tune-riscv = "riscv32"
 # Everything below is generated by riscv-convert.sh
 MULTILIBS  = ""
 MULTILIBS += "multilib:librv32iilp32"
-MULTILIBS += "multilib:librv32if_zicsrilp32f"
+MULTILIBS += "multilib:librv32ifzicsrilp32f"
 MULTILIBS += "multilib:librv32icilp32"
-MULTILIBS += "multilib:librv32ifc_zicsrilp32f"
+MULTILIBS += "multilib:librv32ifczicsrilp32f"
 MULTILIBS += "multilib:librv32imilp32"
-MULTILIBS += "multilib:librv32imf_zicsrilp32f"
+MULTILIBS += "multilib:librv32imfzicsrilp32f"
 MULTILIBS += "multilib:librv32imcilp32"
-MULTILIBS += "multilib:librv32imfc_zicsrilp32f"
+MULTILIBS += "multilib:librv32imfczicsrilp32f"
 MULTILIBS += "multilib:librv64ilp64"
-MULTILIBS += "multilib:librv64if_zicsrlp64f"
+MULTILIBS += "multilib:librv64ifzicsrlp64f"
 MULTILIBS += "multilib:librv64iclp64"
-MULTILIBS += "multilib:librv64ifc_zicsrlp64f"
+MULTILIBS += "multilib:librv64ifczicsrlp64f"
 MULTILIBS += "multilib:librv64imlp64"
-MULTILIBS += "multilib:librv64imf_zicsrlp64f"
+MULTILIBS += "multilib:librv64imfzicsrlp64f"
 MULTILIBS += "multilib:librv64imclp64"
-MULTILIBS += "multilib:librv64imfc_zicsrlp64f"
+MULTILIBS += "multilib:librv64imfczicsrlp64f"
-MULTILIBS += "multilib:librv32imfdc_zicsrilp32d"
+MULTILIBS += "multilib:librv32imfdczicsrilp32d"
-MULTILIBS += "multilib:librv64imfdc_zicsrlp64d"
+MULTILIBS += "multilib:librv64imfdczicsrlp64d"
 # Base configuration
 # CFLAGS:
@@ -84,7 +84,7 @@ TUNE_ARCH:tune-rv32iilp32 = "riscv32"
 # rv32if_zicsr/ilp32f
 # CFLAGS: -march=rv32if_zicsr -mabi=ilp32f
-DEFAULTTUNE:virtclass-multilib-librv32if_zicsrilp32f = "rv32if_zicsrilp32f"
+DEFAULTTUNE:virtclass-multilib-librv32ifzicsrilp32f = "rv32if_zicsrilp32f"
 AVAILTUNES += "rv32if_zicsrilp32f"
 PACKAGE_EXTRA_ARCHS:tune-rv32if_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32if_zicsrilp32f}"
@@ -110,7 +110,7 @@ TUNE_ARCH:tune-rv32icilp32 = "riscv32"
 # rv32ifc_zicsr/ilp32f
 # CFLAGS: -march=rv32ifc_zicsr -mabi=ilp32f
-DEFAULTTUNE:virtclass-multilib-librv32ifc_zicsrilp32f = "rv32ifc_zicsrilp32f"
+DEFAULTTUNE:virtclass-multilib-librv32ifczicsrilp32f = "rv32ifc_zicsrilp32f"
 AVAILTUNES += "rv32ifc_zicsrilp32f"
 PACKAGE_EXTRA_ARCHS:tune-rv32ifc_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32ifc_zicsrilp32f}"
@@ -136,7 +136,7 @@ TUNE_ARCH:tune-rv32imilp32 = "riscv32"
 # rv32imf_zicsr/ilp32f
 # CFLAGS: -march=rv32imf_zicsr -mabi=ilp32f
-DEFAULTTUNE:virtclass-multilib-librv32imf_zicsrilp32f = "rv32imf_zicsrilp32f"
+DEFAULTTUNE:virtclass-multilib-librv32imfzicsrilp32f = "rv32imf_zicsrilp32f"
 AVAILTUNES += "rv32imf_zicsrilp32f"
 PACKAGE_EXTRA_ARCHS:tune-rv32imf_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32imf_zicsrilp32f}"
@@ -162,7 +162,7 @@ TUNE_ARCH:tune-rv32imcilp32 = "riscv32"
 # rv32imfc_zicsr/ilp32f
 # CFLAGS: -march=rv32imfc_zicsr -mabi=ilp32f
-DEFAULTTUNE:virtclass-multilib-librv32imfc_zicsrilp32f = "rv32imfc_zicsrilp32f"
+DEFAULTTUNE:virtclass-multilib-librv32imfczicsrilp32f = "rv32imfc_zicsrilp32f"
 AVAILTUNES += "rv32imfc_zicsrilp32f"
 PACKAGE_EXTRA_ARCHS:tune-rv32imfc_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32imfc_zicsrilp32f}"
@@ -188,7 +188,7 @@ TUNE_ARCH:tune-rv64ilp64 = "riscv64"
 # rv64if_zicsr/lp64f
 # CFLAGS: -march=rv64if_zicsr -mabi=lp64f
-DEFAULTTUNE:virtclass-multilib-librv64if_zicsrlp64f = "rv64if_zicsrlp64f"
+DEFAULTTUNE:virtclass-multilib-librv64ifzicsrlp64f = "rv64if_zicsrlp64f"
 AVAILTUNES += "rv64if_zicsrlp64f"
 PACKAGE_EXTRA_ARCHS:tune-rv64if_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64if_zicsrlp64f}"
@@ -214,7 +214,7 @@ TUNE_ARCH:tune-rv64iclp64 = "riscv64"
 # rv64ifc_zicsr/lp64f
 # CFLAGS: -march=rv64ifc_zicsr -mabi=lp64f
-DEFAULTTUNE:virtclass-multilib-librv64ifc_zicsrlp64f = "rv64ifc_zicsrlp64f"
+DEFAULTTUNE:virtclass-multilib-librv64ifczicsrlp64f = "rv64ifc_zicsrlp64f"
 AVAILTUNES += "rv64ifc_zicsrlp64f"
 PACKAGE_EXTRA_ARCHS:tune-rv64ifc_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64ifc_zicsrlp64f}"
@@ -240,7 +240,7 @@ TUNE_ARCH:tune-rv64imlp64 = "riscv64"
 # rv64imf_zicsr/lp64f
 # CFLAGS: -march=rv64imf_zicsr -mabi=lp64f
-DEFAULTTUNE:virtclass-multilib-librv64imf_zicsrlp64f = "rv64imf_zicsrlp64f"
+DEFAULTTUNE:virtclass-multilib-librv64imfzicsrlp64f = "rv64imf_zicsrlp64f"
 AVAILTUNES += "rv64imf_zicsrlp64f"
 PACKAGE_EXTRA_ARCHS:tune-rv64imf_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64imf_zicsrlp64f}"
@@ -266,7 +266,7 @@ TUNE_ARCH:tune-rv64imclp64 = "riscv64"
 # rv64imfc_zicsr/lp64f
 # CFLAGS: -march=rv64imfc_zicsr -mabi=lp64f
-DEFAULTTUNE:virtclass-multilib-librv64imfc_zicsrlp64f = "rv64imfc_zicsrlp64f"
+DEFAULTTUNE:virtclass-multilib-librv64imfczicsrlp64f = "rv64imfc_zicsrlp64f"
 AVAILTUNES += "rv64imfc_zicsrlp64f"
 PACKAGE_EXTRA_ARCHS:tune-rv64imfc_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64imfc_zicsrlp64f}"
@@ -279,7 +279,7 @@ TUNE_ARCH:tune-rv64imfc_zicsrlp64f = "riscv64"
 # rv32imfdc_zicsr/ilp32d
 # CFLAGS: -march=rv32imfdc_zicsr -mabi=ilp32d
-DEFAULTTUNE:virtclass-multilib-librv32imfdc_zicsrilp32d = "rv32imfdc_zicsrilp32d"
+DEFAULTTUNE:virtclass-multilib-librv32imfdczicsrilp32d = "rv32imfdc_zicsrilp32d"
 AVAILTUNES += "rv32imfdc_zicsrilp32d"
 PACKAGE_EXTRA_ARCHS:tune-rv32imfdc_zicsrilp32d = "${TUNE_PKGARCH:tune-rv32imfdc_zicsrilp32d}"
@@ -292,7 +292,7 @@ TUNE_ARCH:tune-rv32imfdc_zicsrilp32d = "riscv32"
 # rv64imfdc_zicsr/lp64d
 # CFLAGS: -march=rv64imfdc_zicsr -mabi=lp64d
-DEFAULTTUNE:virtclass-multilib-librv64imfdc_zicsrlp64d = "rv64imfdc_zicsrlp64d"
+DEFAULTTUNE:virtclass-multilib-librv64imfdczicsrlp64d = "rv64imfdc_zicsrlp64d"
 AVAILTUNES += "rv64imfdc_zicsrlp64d"
 PACKAGE_EXTRA_ARCHS:tune-rv64imfdc_zicsrlp64d = "${TUNE_PKGARCH:tune-rv64imfdc_zicsrlp64d}"
diff --git a/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh b/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh
index bc8af794..aa01fee0 100755
--- a/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh
+++ b/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh
@@ -27,7 +27,7 @@ sed -e 's,;, ,' |
    fi
    cflags=$(echo $args | sed -e 's,@, -,g')
-    multilib="lib$(echo $mlib | sed -e 's,/,,g')"
+    multilib="lib$(echo $mlib | sed -e 's,/,,g' -e 's,_,,g')"
    tune="$(echo $mlib | sed -e 's,/,,g')"
    case $mlib in
        .)  arch="riscv32" ;;

diff --git a/meta-vitis-tc/conf/machine/riscv-tc.conf b/meta-vitis-tc/conf/machine/riscv-tc.conf index 0a6c6d08..89ee39a2 100644 --- a/meta-vitis-tc/conf/machine/riscv-tc.conf +++ b/meta-vitis-tc/conf/machine/riscv-tc.conf
@@ -38,23 +38,23 @@ TUNE_ARCH:tune-riscv = "riscv32"
38	# Everything below is generated by riscv-convert.sh	38	# Everything below is generated by riscv-convert.sh
39	MULTILIBS = ""	39	MULTILIBS = ""
40	MULTILIBS += "multilib:librv32iilp32"	40	MULTILIBS += "multilib:librv32iilp32"
41	MULTILIBS += "multilib:librv32if_zicsrilp32f"	41	MULTILIBS += "multilib:librv32ifzicsrilp32f"
42	MULTILIBS += "multilib:librv32icilp32"	42	MULTILIBS += "multilib:librv32icilp32"
43	MULTILIBS += "multilib:librv32ifc_zicsrilp32f"	43	MULTILIBS += "multilib:librv32ifczicsrilp32f"
44	MULTILIBS += "multilib:librv32imilp32"	44	MULTILIBS += "multilib:librv32imilp32"
45	MULTILIBS += "multilib:librv32imf_zicsrilp32f"	45	MULTILIBS += "multilib:librv32imfzicsrilp32f"
46	MULTILIBS += "multilib:librv32imcilp32"	46	MULTILIBS += "multilib:librv32imcilp32"
47	MULTILIBS += "multilib:librv32imfc_zicsrilp32f"	47	MULTILIBS += "multilib:librv32imfczicsrilp32f"
48	MULTILIBS += "multilib:librv64ilp64"	48	MULTILIBS += "multilib:librv64ilp64"
49	MULTILIBS += "multilib:librv64if_zicsrlp64f"	49	MULTILIBS += "multilib:librv64ifzicsrlp64f"
50	MULTILIBS += "multilib:librv64iclp64"	50	MULTILIBS += "multilib:librv64iclp64"
51	MULTILIBS += "multilib:librv64ifc_zicsrlp64f"	51	MULTILIBS += "multilib:librv64ifczicsrlp64f"
52	MULTILIBS += "multilib:librv64imlp64"	52	MULTILIBS += "multilib:librv64imlp64"
53	MULTILIBS += "multilib:librv64imf_zicsrlp64f"	53	MULTILIBS += "multilib:librv64imfzicsrlp64f"
54	MULTILIBS += "multilib:librv64imclp64"	54	MULTILIBS += "multilib:librv64imclp64"
55	MULTILIBS += "multilib:librv64imfc_zicsrlp64f"	55	MULTILIBS += "multilib:librv64imfczicsrlp64f"
56	MULTILIBS += "multilib:librv32imfdc_zicsrilp32d"	56	MULTILIBS += "multilib:librv32imfdczicsrilp32d"
57	MULTILIBS += "multilib:librv64imfdc_zicsrlp64d"	57	MULTILIBS += "multilib:librv64imfdczicsrlp64d"
58		58
59	# Base configuration	59	# Base configuration
60	# CFLAGS:	60	# CFLAGS:
@@ -84,7 +84,7 @@ TUNE_ARCH:tune-rv32iilp32 = "riscv32"
84		84
85	# rv32if_zicsr/ilp32f	85	# rv32if_zicsr/ilp32f
86	# CFLAGS: -march=rv32if_zicsr -mabi=ilp32f	86	# CFLAGS: -march=rv32if_zicsr -mabi=ilp32f
87	DEFAULTTUNE:virtclass-multilib-librv32if_zicsrilp32f = "rv32if_zicsrilp32f"	87	DEFAULTTUNE:virtclass-multilib-librv32ifzicsrilp32f = "rv32if_zicsrilp32f"
88		88
89	AVAILTUNES += "rv32if_zicsrilp32f"	89	AVAILTUNES += "rv32if_zicsrilp32f"
90	PACKAGE_EXTRA_ARCHS:tune-rv32if_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32if_zicsrilp32f}"	90	PACKAGE_EXTRA_ARCHS:tune-rv32if_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32if_zicsrilp32f}"
@@ -110,7 +110,7 @@ TUNE_ARCH:tune-rv32icilp32 = "riscv32"
110		110
111	# rv32ifc_zicsr/ilp32f	111	# rv32ifc_zicsr/ilp32f
112	# CFLAGS: -march=rv32ifc_zicsr -mabi=ilp32f	112	# CFLAGS: -march=rv32ifc_zicsr -mabi=ilp32f
113	DEFAULTTUNE:virtclass-multilib-librv32ifc_zicsrilp32f = "rv32ifc_zicsrilp32f"	113	DEFAULTTUNE:virtclass-multilib-librv32ifczicsrilp32f = "rv32ifc_zicsrilp32f"
114		114
115	AVAILTUNES += "rv32ifc_zicsrilp32f"	115	AVAILTUNES += "rv32ifc_zicsrilp32f"
116	PACKAGE_EXTRA_ARCHS:tune-rv32ifc_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32ifc_zicsrilp32f}"	116	PACKAGE_EXTRA_ARCHS:tune-rv32ifc_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32ifc_zicsrilp32f}"
@@ -136,7 +136,7 @@ TUNE_ARCH:tune-rv32imilp32 = "riscv32"
136		136
137	# rv32imf_zicsr/ilp32f	137	# rv32imf_zicsr/ilp32f
138	# CFLAGS: -march=rv32imf_zicsr -mabi=ilp32f	138	# CFLAGS: -march=rv32imf_zicsr -mabi=ilp32f
139	DEFAULTTUNE:virtclass-multilib-librv32imf_zicsrilp32f = "rv32imf_zicsrilp32f"	139	DEFAULTTUNE:virtclass-multilib-librv32imfzicsrilp32f = "rv32imf_zicsrilp32f"
140		140
141	AVAILTUNES += "rv32imf_zicsrilp32f"	141	AVAILTUNES += "rv32imf_zicsrilp32f"
142	PACKAGE_EXTRA_ARCHS:tune-rv32imf_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32imf_zicsrilp32f}"	142	PACKAGE_EXTRA_ARCHS:tune-rv32imf_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32imf_zicsrilp32f}"
@@ -162,7 +162,7 @@ TUNE_ARCH:tune-rv32imcilp32 = "riscv32"
162		162
163	# rv32imfc_zicsr/ilp32f	163	# rv32imfc_zicsr/ilp32f
164	# CFLAGS: -march=rv32imfc_zicsr -mabi=ilp32f	164	# CFLAGS: -march=rv32imfc_zicsr -mabi=ilp32f
165	DEFAULTTUNE:virtclass-multilib-librv32imfc_zicsrilp32f = "rv32imfc_zicsrilp32f"	165	DEFAULTTUNE:virtclass-multilib-librv32imfczicsrilp32f = "rv32imfc_zicsrilp32f"
166		166
167	AVAILTUNES += "rv32imfc_zicsrilp32f"	167	AVAILTUNES += "rv32imfc_zicsrilp32f"
168	PACKAGE_EXTRA_ARCHS:tune-rv32imfc_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32imfc_zicsrilp32f}"	168	PACKAGE_EXTRA_ARCHS:tune-rv32imfc_zicsrilp32f = "${TUNE_PKGARCH:tune-rv32imfc_zicsrilp32f}"
@@ -188,7 +188,7 @@ TUNE_ARCH:tune-rv64ilp64 = "riscv64"
188		188
189	# rv64if_zicsr/lp64f	189	# rv64if_zicsr/lp64f
190	# CFLAGS: -march=rv64if_zicsr -mabi=lp64f	190	# CFLAGS: -march=rv64if_zicsr -mabi=lp64f
191	DEFAULTTUNE:virtclass-multilib-librv64if_zicsrlp64f = "rv64if_zicsrlp64f"	191	DEFAULTTUNE:virtclass-multilib-librv64ifzicsrlp64f = "rv64if_zicsrlp64f"
192		192
193	AVAILTUNES += "rv64if_zicsrlp64f"	193	AVAILTUNES += "rv64if_zicsrlp64f"
194	PACKAGE_EXTRA_ARCHS:tune-rv64if_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64if_zicsrlp64f}"	194	PACKAGE_EXTRA_ARCHS:tune-rv64if_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64if_zicsrlp64f}"
@@ -214,7 +214,7 @@ TUNE_ARCH:tune-rv64iclp64 = "riscv64"
214		214
215	# rv64ifc_zicsr/lp64f	215	# rv64ifc_zicsr/lp64f
216	# CFLAGS: -march=rv64ifc_zicsr -mabi=lp64f	216	# CFLAGS: -march=rv64ifc_zicsr -mabi=lp64f
217	DEFAULTTUNE:virtclass-multilib-librv64ifc_zicsrlp64f = "rv64ifc_zicsrlp64f"	217	DEFAULTTUNE:virtclass-multilib-librv64ifczicsrlp64f = "rv64ifc_zicsrlp64f"
218		218
219	AVAILTUNES += "rv64ifc_zicsrlp64f"	219	AVAILTUNES += "rv64ifc_zicsrlp64f"
220	PACKAGE_EXTRA_ARCHS:tune-rv64ifc_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64ifc_zicsrlp64f}"	220	PACKAGE_EXTRA_ARCHS:tune-rv64ifc_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64ifc_zicsrlp64f}"
@@ -240,7 +240,7 @@ TUNE_ARCH:tune-rv64imlp64 = "riscv64"
240		240
241	# rv64imf_zicsr/lp64f	241	# rv64imf_zicsr/lp64f
242	# CFLAGS: -march=rv64imf_zicsr -mabi=lp64f	242	# CFLAGS: -march=rv64imf_zicsr -mabi=lp64f
243	DEFAULTTUNE:virtclass-multilib-librv64imf_zicsrlp64f = "rv64imf_zicsrlp64f"	243	DEFAULTTUNE:virtclass-multilib-librv64imfzicsrlp64f = "rv64imf_zicsrlp64f"
244		244
245	AVAILTUNES += "rv64imf_zicsrlp64f"	245	AVAILTUNES += "rv64imf_zicsrlp64f"
246	PACKAGE_EXTRA_ARCHS:tune-rv64imf_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64imf_zicsrlp64f}"	246	PACKAGE_EXTRA_ARCHS:tune-rv64imf_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64imf_zicsrlp64f}"
@@ -266,7 +266,7 @@ TUNE_ARCH:tune-rv64imclp64 = "riscv64"
266		266
267	# rv64imfc_zicsr/lp64f	267	# rv64imfc_zicsr/lp64f
268	# CFLAGS: -march=rv64imfc_zicsr -mabi=lp64f	268	# CFLAGS: -march=rv64imfc_zicsr -mabi=lp64f
269	DEFAULTTUNE:virtclass-multilib-librv64imfc_zicsrlp64f = "rv64imfc_zicsrlp64f"	269	DEFAULTTUNE:virtclass-multilib-librv64imfczicsrlp64f = "rv64imfc_zicsrlp64f"
270		270
271	AVAILTUNES += "rv64imfc_zicsrlp64f"	271	AVAILTUNES += "rv64imfc_zicsrlp64f"
272	PACKAGE_EXTRA_ARCHS:tune-rv64imfc_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64imfc_zicsrlp64f}"	272	PACKAGE_EXTRA_ARCHS:tune-rv64imfc_zicsrlp64f = "${TUNE_PKGARCH:tune-rv64imfc_zicsrlp64f}"
@@ -279,7 +279,7 @@ TUNE_ARCH:tune-rv64imfc_zicsrlp64f = "riscv64"
279		279
280	# rv32imfdc_zicsr/ilp32d	280	# rv32imfdc_zicsr/ilp32d
281	# CFLAGS: -march=rv32imfdc_zicsr -mabi=ilp32d	281	# CFLAGS: -march=rv32imfdc_zicsr -mabi=ilp32d
282	DEFAULTTUNE:virtclass-multilib-librv32imfdc_zicsrilp32d = "rv32imfdc_zicsrilp32d"	282	DEFAULTTUNE:virtclass-multilib-librv32imfdczicsrilp32d = "rv32imfdc_zicsrilp32d"
283		283
284	AVAILTUNES += "rv32imfdc_zicsrilp32d"	284	AVAILTUNES += "rv32imfdc_zicsrilp32d"
285	PACKAGE_EXTRA_ARCHS:tune-rv32imfdc_zicsrilp32d = "${TUNE_PKGARCH:tune-rv32imfdc_zicsrilp32d}"	285	PACKAGE_EXTRA_ARCHS:tune-rv32imfdc_zicsrilp32d = "${TUNE_PKGARCH:tune-rv32imfdc_zicsrilp32d}"
@@ -292,7 +292,7 @@ TUNE_ARCH:tune-rv32imfdc_zicsrilp32d = "riscv32"
292		292
293	# rv64imfdc_zicsr/lp64d	293	# rv64imfdc_zicsr/lp64d
294	# CFLAGS: -march=rv64imfdc_zicsr -mabi=lp64d	294	# CFLAGS: -march=rv64imfdc_zicsr -mabi=lp64d
295	DEFAULTTUNE:virtclass-multilib-librv64imfdc_zicsrlp64d = "rv64imfdc_zicsrlp64d"	295	DEFAULTTUNE:virtclass-multilib-librv64imfdczicsrlp64d = "rv64imfdc_zicsrlp64d"
296		296
297	AVAILTUNES += "rv64imfdc_zicsrlp64d"	297	AVAILTUNES += "rv64imfdc_zicsrlp64d"
298	PACKAGE_EXTRA_ARCHS:tune-rv64imfdc_zicsrlp64d = "${TUNE_PKGARCH:tune-rv64imfdc_zicsrlp64d}"	298	PACKAGE_EXTRA_ARCHS:tune-rv64imfdc_zicsrlp64d = "${TUNE_PKGARCH:tune-rv64imfdc_zicsrlp64d}"


diff --git a/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh b/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh index bc8af794..aa01fee0 100755 --- a/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh +++ b/meta-vitis-tc/recipes-devtools/gcc/riscv-convert.sh
@@ -27,7 +27,7 @@ sed -e 's,;, ,' \|
27	fi	27	fi
28		28
29	cflags=$(echo $args \| sed -e 's,@, -,g')	29	cflags=$(echo $args \| sed -e 's,@, -,g')
30	multilib="lib$(echo $mlib \| sed -e 's,/,,g')"	30	multilib="lib$(echo $mlib \| sed -e 's,/,,g' -e 's,_,,g')"
31	tune="$(echo $mlib \| sed -e 's,/,,g')"	31	tune="$(echo $mlib \| sed -e 's,/,,g')"
32	case $mlib in	32	case $mlib in
33	.) arch="riscv32" ;;	33	.) arch="riscv32" ;;