ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: Merge riscv32 and riscv64 host architectures 

The existing code for safe-syscall.inc.S will compile
without change for riscv32 and riscv64.  We may also
drop the meson.build stanza that merges them for tcg/.

Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-09-17 11:08:09 -07:00
parent 940b30904e
commit ba0e733362
5 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -570,11 +570,7 @@ elif check_define __s390__ ; then
cpu="s390" cpu="s390"
fi fi
elif check_define __riscv ; then elif check_define __riscv ; then
if check_define _LP64 ; then cpu="riscv"
cpu="riscv64"
else
cpu="riscv32"
fi
elif check_define __arm__ ; then elif check_define __arm__ ; then
cpu="arm" cpu="arm"
elif check_define __aarch64__ ; then elif check_define __aarch64__ ; then
@ -587,7 +583,7 @@ ARCH=
# Normalise host CPU name and set ARCH. # Normalise host CPU name and set ARCH.
# Note that this case should only have supported host CPUs, not guests. # Note that this case should only have supported host CPUs, not guests.
case "$cpu" in case "$cpu" in
ppc|ppc64|s390x|sparc64|x32|riscv32|riscv64) ppc|ppc64|s390x|sparc64|x32|riscv)
;; ;;
ppc64le) ppc64le)
ARCH="ppc64" ARCH="ppc64"

4
linux-user/host/riscv64/hostdep.h → linux-user/host/riscv/hostdep.h
View File

@ -5,8 +5,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef RISCV64_HOSTDEP_H #ifndef RISCV_HOSTDEP_H
#define RISCV64_HOSTDEP_H #define RISCV_HOSTDEP_H
/* We have a safe-syscall.inc.S */ /* We have a safe-syscall.inc.S */
#define HAVE_SAFE_SYSCALL #define HAVE_SAFE_SYSCALL

0
linux-user/host/riscv64/safe-syscall.inc.S → linux-user/host/riscv/safe-syscall.inc.S
View File

11
linux-user/host/riscv32/hostdep.h
View File

@ -1,11 +0,0 @@
/*
* hostdep.h : things which are dependent on the host architecture
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef RISCV32_HOSTDEP_H
#define RISCV32_HOSTDEP_H
#endif

4
meson.build
View File

@ -55,7 +55,7 @@ have_block = have_system or have_tools
python = import('python').find_installation() python = import('python').find_installation()
supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux'] supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux']
supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', 'x86_64', supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv', 'x86', 'x86_64',
'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64']
cpu = host_machine.cpu_family() cpu = host_machine.cpu_family()
@ -351,8 +351,6 @@ if not get_option('tcg').disabled()
tcg_arch = 'i386' tcg_arch = 'i386'
elif config_host['ARCH'] == 'ppc64' elif config_host['ARCH'] == 'ppc64'
tcg_arch = 'ppc' tcg_arch = 'ppc'
elif config_host['ARCH'] in ['riscv32', 'riscv64']
tcg_arch = 'riscv'
endif endif
add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tcg_arch, add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tcg_arch,
language: ['c', 'cpp', 'objc']) language: ['c', 'cpp', 'objc'])