From 9e4aa7a47a936b30c7f1d50be57fa072d1dabc4b Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 22 Nov 2017 12:46:06 +0100
Subject: poly1305: import MIPS64 primitive from OpenSSL

---
 src/tests/qemu/Makefile             | 8 ++++----
 src/tests/qemu/arch/mips64.config   | 3 ++-
 src/tests/qemu/arch/mips64el.config | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/tests/qemu')

diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index 2f288a5..875baf4 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -117,8 +117,8 @@ ifeq ($(CHOST),$(CBUILD))
 QEMU_MACHINE := -cpu host -machine malta,accel=kvm
 CFLAGS += -EB
 else
-QEMU_MACHINE := -cpu 20Kc -machine malta -smp 1
-CFLAGS += -march=mips64r2 -EB
+QEMU_MACHINE := -cpu I6400 -machine malta
+CFLAGS += -march=mips64r6 -EB
 endif
 else ifeq ($(ARCH),mips64el)
 QEMU_ARCH := mips64el
@@ -128,8 +128,8 @@ ifeq ($(CHOST),$(CBUILD))
 QEMU_MACHINE := -cpu host -machine malta,accel=kvm
 CFLAGS += -EL
 else
-QEMU_MACHINE := -cpu 20Kc -machine malta -smp 1
-CFLAGS += -march=mips64r2 -EL
+QEMU_MACHINE := -cpu I6400 -machine malta
+CFLAGS += -march=mips64r6 -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 6fc6bc4..37d8947 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_R2=y
+CONFIG_CPU_MIPS64_R6=y
+CONFIG_CPU_HAS_MSA=y
 CONFIG_MIPS_MALTA=y
 CONFIG_MIPS_CPS=y
 CONFIG_POWER_RESET=y
diff --git a/src/tests/qemu/arch/mips64el.config b/src/tests/qemu/arch/mips64el.config
index fc1e43a..2529a60 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_R2=y
+CONFIG_CPU_MIPS64_R6=y
+CONFIG_CPU_HAS_MSA=y
 CONFIG_MIPS_MALTA=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_MIPS_CPS=y
-- 
cgit v1.2.3-59-g8ed1b