summaryrefslogtreecommitdiff
path: root/regress/sys/kern
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2016-08-19 17:39:38 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2016-08-19 17:39:38 +0000
commit86a30b3cf08420597ac63110a02f1980dcfadbf2 (patch)
treea7fbc971441f8f645c9fe2ca1192b24ed2fae295 /regress/sys/kern
parent8aff688f041d26d42f4d13cffba5a63899d80fc8 (diff)
Add support for arm and enable on armv7.
Diffstat (limited to 'regress/sys/kern')
-rw-r--r--regress/sys/kern/noexec/Makefile4
-rw-r--r--regress/sys/kern/noexec/testfly.S7
2 files changed, 8 insertions, 3 deletions
diff --git a/regress/sys/kern/noexec/Makefile b/regress/sys/kern/noexec/Makefile
index 964fa0017bb..803bae6c16d 100644
--- a/regress/sys/kern/noexec/Makefile
+++ b/regress/sys/kern/noexec/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2014/01/10 13:45:00 jsing Exp $
+# $OpenBSD: Makefile,v 1.14 2016/08/19 17:39:37 kettenis Exp $
.if ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \
- ${MACHINE} == "alpha" || \
+ ${MACHINE} == "alpha" || ${MACHINE} == "armv7" || \
${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \
${MACHINE} == "hppa"
diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S
index 7faa0608797..259d98c8d56 100644
--- a/regress/sys/kern/noexec/testfly.S
+++ b/regress/sys/kern/noexec/testfly.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: testfly.S,v 1.1 2014/01/10 13:45:00 jsing Exp $ */
+/* $OpenBSD: testfly.S,v 1.2 2016/08/19 17:39:37 kettenis Exp $ */
/*
* Copyright (c) 2002,2003 Michael Shalayeff
@@ -53,4 +53,9 @@ LEAF_ENTRY(testfly)
EXIT(testfly)
#endif
+#ifdef __arm__
+ENTRY(testfly)
+ mov pc, lr
+#endif
+
.space 8192