From: kettenis <kettenis@openbsd.org>
Date: Wed, 12 Sep 2018 11:59:40 +0000 (+0000)
Subject: Make this work on arm64.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7de7e642d4248b7391f02bfbab009b21e0305897;p=openbsd

Make this work on arm64.
---

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)