Determine QEMU CPU dynamically from ELF files.

Remove hardcoded QEMU CPU selection logic and instead
use "mcpu-to-cpu-opts" to dynamically determine the
appropriate CPU and XLEN from the ELF file in simulator
wrappers.

Signed-off-by: Luis Silva <[email protected]>

Author: luismgsilva

Makefile.in

@@ -118,17 +118,6 @@ NEWLIB_CC_FOR_TARGET ?= $(NEWLIB_TUPLE)-gcc
 NEWLIB_CXX_FOR_TARGET ?= $(NEWLIB_TUPLE)-g++
 NEWLIB_TARGET_BOARDS ?= arc-sim
 
-# QEMU sim setup for running the tests
-ifeq (@target_alias@,arc)
-	QEMU_CPU = archs
-else
-ifeq (@target_alias@,arc32)
-	QEMU_CPU = hs5x
-else
-	QEMU_CPU = hs6x
-endif
-endif
-
 ifeq (@default_target@,linux)
 	TARGET_ALIAS = $(call make_tuple,linux-gnu)
 	TARGET_TRIPLET = $(call make_tupple,unknown-linux-gnu)

scripts/wrapper/qemu/arc64-elf-run

@@ -10,7 +10,8 @@ do
     shift
 done
 
-xlen="$(readelf -h $1 | grep 'Class' | cut -d: -f 2 | xargs echo | sed 's/^ELF//')"
+cpu=$(mcpu-to-cpu-opts --elf-file-path $1 --print-cpu)
+xlen=$(mcpu-to-cpu-opts --elf-file-path $1 --print-xlen)
 
 case "$xlen" in
     64) qemu="64"
@@ -19,5 +20,5 @@ case "$xlen" in
 	mem="2G";;
 esac
 
-qemu-system-arc$qemu -cpu ${QEMU_CPU} -M arc-sim -m $mem "${qemu_args[@]}" -nographic \
+qemu-system-arc$qemu -cpu $cpu -M arc-sim -m $mem "${qemu_args[@]}" -nographic \
 		     -no-reboot -monitor none -kernel "$@"

scripts/wrapper/qemu/arc64-linux-gnu-run

@@ -10,11 +10,12 @@ do
     shift
 done
 
-xlen="$(readelf -h $1 | grep 'Class' | cut -d: -f 2 | xargs echo | sed 's/^ELF//')"
+cpu=$(mcpu-to-cpu-opts --elf-file-path $1 --print-cpu)
+xlen=$(mcpu-to-cpu-opts --elf-file-path $1 --print-xlen)
 
 case "$xlen" in
     64) qemu="64";;
     *) qemu="";;
 esac
 
-qemu-arc$qemu -cpu ${QEMU_CPU} -R 3G "${qemu_args[@]}" -L ${ARC_SYSROOT} "$@"
+qemu-arc$qemu -cpu $cpu -R 3G "${qemu_args[@]}" -L ${ARC_SYSROOT} "$@"