diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-01 18:56:04 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-02 14:37:53 +0200 |
| commit | db3b2ee65fec9d5649bf22df2776b33647927567 (patch) | |
| tree | ab2552b5289efba65bbce3c9289efe065bb3c622 /src | |
| parent | efeac267d97caaaf53ce74d9cb22df8ab244db30 (diff) | |
qemu: give up and accept a mips64r2 world
We can't do SMP this way, and we also fall back to using the default N32
ABI, which is a bummer. But the mips64r6 toolchain is too much of a
hassle to build with Gentoo's crossdev, and at least this works.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/qemu/Makefile | 8 | ||||
| -rw-r--r-- | src/tests/qemu/arch/mips64.config | 3 | ||||
| -rw-r--r-- | src/tests/qemu/arch/mips64el.config | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile index a3bde55..f00f6dd 100644 --- a/src/tests/qemu/Makefile +++ b/src/tests/qemu/Makefile @@ -146,8 +146,8 @@ ifeq ($(CHOST),$(CBUILD)) QEMU_MACHINE := -cpu host -machine malta,accel=kvm CFLAGS += -EB else -QEMU_MACHINE := -cpu I6400 -machine malta -CFLAGS += -march=mips64r6 -EB +QEMU_MACHINE := -cpu MIPS64R2-generic -machine malta -smp 1 +CFLAGS += -march=mips64r2 -EB endif else ifeq ($(ARCH),mips64el) QEMU_ARCH := mips64el @@ -157,8 +157,8 @@ ifeq ($(CHOST),$(CBUILD)) QEMU_MACHINE := -cpu host -machine malta,accel=kvm CFLAGS += -EL else -QEMU_MACHINE := -cpu I6400 -machine malta -CFLAGS += -march=mips64r6 -EL +QEMU_MACHINE := -cpu MIPS64R2-generic -machine malta -smp 1 +CFLAGS += -march=mips64r2 -EL endif else ifeq ($(ARCH),mips) QEMU_ARCH := mips diff --git a/src/tests/qemu/arch/mips64.config b/src/tests/qemu/arch/mips64.config index 37d8947..2b6a5e0 100644 --- a/src/tests/qemu/arch/mips64.config +++ b/src/tests/qemu/arch/mips64.config @@ -1,5 +1,6 @@ CONFIG_64BIT=y -CONFIG_CPU_MIPS64_R6=y +CONFIG_CPU_MIPS64_R2=y +CONFIG_MIPS32_N32=y CONFIG_CPU_HAS_MSA=y CONFIG_MIPS_MALTA=y CONFIG_MIPS_CPS=y diff --git a/src/tests/qemu/arch/mips64el.config b/src/tests/qemu/arch/mips64el.config index 2529a60..5b7ef76 100644 --- a/src/tests/qemu/arch/mips64el.config +++ b/src/tests/qemu/arch/mips64el.config @@ -1,5 +1,6 @@ CONFIG_64BIT=y -CONFIG_CPU_MIPS64_R6=y +CONFIG_CPU_MIPS64_R2=y +CONFIG_MIPS32_N32=y CONFIG_CPU_HAS_MSA=y CONFIG_MIPS_MALTA=y CONFIG_CPU_LITTLE_ENDIAN=y |