From ccdcd71b468e818246795d43d8c3c3193382e08f Mon Sep 17 00:00:00 2001 From: kettenis Date: Fri, 19 Aug 2016 17:39:37 +0000 Subject: [PATCH] Add support for arm and enable on armv7. --- regress/sys/kern/noexec/Makefile | 4 ++-- regress/sys/kern/noexec/testfly.S | 7 ++++++- 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 -- 2.20.1