diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-09-24 19:20:38 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2016-09-24 19:20:38 +0000 |
| commit | 444a689a987a33c8f38119749c2878679af16609 (patch) | |
| tree | 4a08cf8f0648b3297dcb807a3731d9f9efa4253f /regress/sys | |
| parent | 644af9b1bd940dde309f118c5a2ff0773eac64bb (diff) | |
On sparc64 we need "retl" not "ret" to do an immediate return.
ok deraadt@, tedu@
Diffstat (limited to 'regress/sys')
| -rw-r--r-- | regress/sys/kern/noexec/testfly.S | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S index 259d98c8d56..b4ee691bf45 100644 --- a/regress/sys/kern/noexec/testfly.S +++ b/regress/sys/kern/noexec/testfly.S @@ -1,4 +1,4 @@ -/* $OpenBSD: testfly.S,v 1.2 2016/08/19 17:39:37 kettenis Exp $ */ +/* $OpenBSD: testfly.S,v 1.3 2016/09/24 19:20:37 kettenis Exp $ */ /* * Copyright (c) 2002,2003 Michael Shalayeff @@ -32,11 +32,9 @@ .space 8192 -#if defined(__amd64__) || defined(__i386__) || \ - defined(__sparc__) || defined(__sparc64__) +#if defined(__amd64__) || defined(__i386__) ENTRY(testfly) ret - nop #endif #ifdef __alpha__ @@ -58,4 +56,10 @@ ENTRY(testfly) mov pc, lr #endif +#if defined(__sparc64__) +ENTRY(testfly) + retl + nop +#endif + .space 8192 |