4 files changed, 6 insertions, 4 deletions
diff --git a/scripts/wrapper/qemu/riscv32-unknown-elf-run b/scripts/wrapper/qemu/riscv32-unknown-elf-run
index 194d05c..58669de 100755..120000
--- a/scripts/wrapper/qemu/riscv32-unknown-elf-run
+++ b/scripts/wrapper/qemu/riscv32-unknown-elf-run
@@ -1 +1 @@
-qemu-riscv32 -L ${RISC_V_SYSROOT} $*
+riscv64-unknown-linux-gnu-run
+\ No newline at end of file
diff --git a/scripts/wrapper/qemu/riscv32-unknown-linux-gnu-run b/scripts/wrapper/qemu/riscv32-unknown-linux-gnu-run
index 194d05c..58669de 100755..120000
--- a/scripts/wrapper/qemu/riscv32-unknown-linux-gnu-run
+++ b/scripts/wrapper/qemu/riscv32-unknown-linux-gnu-run
@@ -1 +1 @@
-qemu-riscv32 -L ${RISC_V_SYSROOT} $*
+riscv64-unknown-linux-gnu-run
+\ No newline at end of file
diff --git a/scripts/wrapper/qemu/riscv64-unknown-elf-run b/scripts/wrapper/qemu/riscv64-unknown-elf-run
index dd061ae..58669de 100755..120000
--- a/scripts/wrapper/qemu/riscv64-unknown-elf-run
+++ b/scripts/wrapper/qemu/riscv64-unknown-elf-run
@@ -1 +1 @@
-qemu-riscv64 -L ${RISC_V_SYSROOT} $*
+riscv64-unknown-linux-gnu-run
+\ No newline at end of file
diff --git a/scripts/wrapper/qemu/riscv64-unknown-linux-gnu-run b/scripts/wrapper/qemu/riscv64-unknown-linux-gnu-run
index dd061ae..7aad5ea 100755
--- a/scripts/wrapper/qemu/riscv64-unknown-linux-gnu-run
+++ b/scripts/wrapper/qemu/riscv64-unknown-linux-gnu-run
@@ -1 +1,3 @@
-qemu-riscv64 -L ${RISC_V_SYSROOT} $*
+xlen="$(readelf -h $1 | grep 'Class' | cut -d: -f 2 | xargs echo | sed 's/^ELF//')"
+
+qemu-riscv$xlen -L ${RISC_V_SYSROOT} "$@"