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:librv32imfdc_zicsrilp32d"
-MULTILIBS += "multilib:librv64imfdc_zicsrlp64d"
+MULTILIBS += "multilib:librv64imfczicsrlp64f"
+MULTILIBS += "multilib:librv32imfdczicsrilp32d"
+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" ;;