summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2018-09-12 11:59:40 +0000
committerkettenis <kettenis@openbsd.org>2018-09-12 11:59:40 +0000
commit7de7e642d4248b7391f02bfbab009b21e0305897 (patch)
treedec2c2d0e9a4cb042f5b492daa929ddd746662c5
parentMake pmap_protect(9) actually remove exec permission if the new permissions (diff)
downloadwireguard-openbsd-7de7e642d4248b7391f02bfbab009b21e0305897.tar.xz
wireguard-openbsd-7de7e642d4248b7391f02bfbab009b21e0305897.zip
Make this work on arm64.
-rw-r--r--regress/sys/kern/noexec/Makefile3
-rw-r--r--regress/sys/kern/noexec/testfly.S4
2 files changed, 4 insertions, 3 deletions
diff --git a/regress/sys/kern/noexec/Makefile b/regress/sys/kern/noexec/Makefile
index b18a874cee9..4438dd6614c 100644
--- a/regress/sys/kern/noexec/Makefile
+++ b/regress/sys/kern/noexec/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2018/05/23 19:23:45 bluhm Exp $
+# $OpenBSD: Makefile,v 1.18 2018/09/12 11:59:40 kettenis Exp $
PROG= noexec
SRCS= noexec.c testfly.S
@@ -64,6 +64,7 @@ nxmmap-mprotect: ${PROG}
.if ${MACHINE} != "alpha" && \
${MACHINE} != "amd64" && \
+ ${MACHINE} != "arm64" && \
${MACHINE} != "armv7" && \
${MACHINE} != "hppa" && \
${MACHINE} != "i386" && \
diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S
index 2a2d7cf7d9b..f54e56cf777 100644
--- a/regress/sys/kern/noexec/testfly.S
+++ b/regress/sys/kern/noexec/testfly.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: testfly.S,v 1.4 2017/08/16 19:13:51 deraadt Exp $ */
+/* $OpenBSD: testfly.S,v 1.5 2018/09/12 11:59:40 kettenis Exp $ */
/*
* Copyright (c) 2002,2003 Michael Shalayeff
@@ -32,7 +32,7 @@
.space 8192
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__)
ENTRY(testfly)
ret
END(testfly)