summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvisa <visa@openbsd.org>2019-05-10 15:57:39 +0000
committervisa <visa@openbsd.org>2019-05-10 15:57:39 +0000
commit42de0d2543aaf058de7ce369ee98f2638b992cec (patch)
treef5e924fc98b88f11618e563819fd756128bc05aa
parentsync (diff)
downloadwireguard-openbsd-42de0d2543aaf058de7ce369ee98f2638b992cec.tar.xz
wireguard-openbsd-42de0d2543aaf058de7ce369ee98f2638b992cec.zip
Let the test build on mips64.
OK guenther@
-rw-r--r--regress/sys/kern/noexec/noexec.c4
-rw-r--r--regress/sys/kern/noexec/testfly.S13
2 files changed, 12 insertions, 5 deletions
diff --git a/regress/sys/kern/noexec/noexec.c b/regress/sys/kern/noexec/noexec.c
index 4a854630f99..2f22fb3b40e 100644
--- a/regress/sys/kern/noexec/noexec.c
+++ b/regress/sys/kern/noexec/noexec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: noexec.c,v 1.19 2019/01/31 19:14:12 bluhm Exp $ */
+/* $OpenBSD: noexec.c,v 1.20 2019/05/10 15:57:39 visa Exp $ */
/*
* Copyright (c) 2002,2003 Michael Shalayeff
@@ -44,7 +44,7 @@ int page_size;
char label[64] = "non-exec ";
#define PAD 64*1024
-#define MAXPAGESIZE 8192
+#define MAXPAGESIZE 16384
#define TESTSZ 256 /* assuming the testfly() will fit */
u_int64_t data[(PAD + TESTSZ + PAD + MAXPAGESIZE) / 8] = { 0 };
u_int64_t bss[(PAD + TESTSZ + PAD + MAXPAGESIZE) / 8];
diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S
index 02ae56b4dba..f2811c0392b 100644
--- a/regress/sys/kern/noexec/testfly.S
+++ b/regress/sys/kern/noexec/testfly.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: testfly.S,v 1.6 2019/01/31 19:14:12 bluhm Exp $ */
+/* $OpenBSD: testfly.S,v 1.7 2019/05/10 15:57:39 visa Exp $ */
/*
* Copyright (c) 2002,2003 Michael Shalayeff
@@ -30,7 +30,7 @@
#include <machine/asm.h>
- .space 8192
+ .space 16384
#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__)
ENTRY(testfly)
@@ -58,6 +58,13 @@ ENTRY(testfly)
END(testfly)
#endif
+#ifdef __mips64__
+LEAF(testfly, 0)
+ jr ra
+ nop
+END(testfly)
+#endif
+
#if defined(__sparc64__)
ENTRY(testfly)
retl
@@ -65,4 +72,4 @@ ENTRY(testfly)
END(testfly)
#endif
- .space 8192
+ .space 16384