diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-07-06 07:31:20 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2020-07-06 07:31:20 +0000 |
| commit | cc05fbbddd8ffec9e70f57e6d391a22de4733ab9 (patch) | |
| tree | 727c20ae21ad11090880ff9bbe4e8a01e9dcdc5c | |
| parent | 08a4c5dff3e7c5a4f532df2a62a613a8fa7d80b9 (diff) | |
Make this build on powerpc/powerpc64. Only test on powerpc64 for now
since this is expected to fail on most 32-bit PowerPC CPUs given the
lack of a proper permission bit.
| -rw-r--r-- | regress/sys/kern/noexec/Makefile | 3 | ||||
| -rw-r--r-- | regress/sys/kern/noexec/testfly.S | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/regress/sys/kern/noexec/Makefile b/regress/sys/kern/noexec/Makefile index 836fb6288e6..fbfb4d5d0a4 100644 --- a/regress/sys/kern/noexec/Makefile +++ b/regress/sys/kern/noexec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2019/05/10 15:58:22 visa Exp $ +# $OpenBSD: Makefile,v 1.21 2020/07/06 07:31:19 kettenis Exp $ PROG= noexec SRCS= noexec.c testfly.S @@ -84,6 +84,7 @@ nxmmap-mprotect: ${PROG} ${MACHINE} != "hppa" && \ ${MACHINE} != "i386" && \ ${MACHINE} != "octeon" && \ + ${MACHINE} != "powerpc64" && \ ${MACHINE} != "sparc64" REGRESS_TARGETS=run-regress-skiparch run-regress-skiparch: diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S index f2811c0392b..46faa42d936 100644 --- a/regress/sys/kern/noexec/testfly.S +++ b/regress/sys/kern/noexec/testfly.S @@ -1,4 +1,4 @@ -/* $OpenBSD: testfly.S,v 1.7 2019/05/10 15:57:39 visa Exp $ */ +/* $OpenBSD: testfly.S,v 1.8 2020/07/06 07:31:19 kettenis Exp $ */ /* * Copyright (c) 2002,2003 Michael Shalayeff @@ -65,6 +65,12 @@ LEAF(testfly, 0) END(testfly) #endif +#ifdef __powerpc__ +ENTRY(testfly) + blr +END(testfly) +#endif + #if defined(__sparc64__) ENTRY(testfly) retl |