From: jsing <jsing@openbsd.org>
Date: Fri, 10 Jan 2014 13:45:00 +0000 (+0000)
Subject: Do not include MD assembly code in a sys regress test. Untested on alpha,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c30cf03940dbb027575f4ff7305249711d152159;p=openbsd

Do not include MD assembly code in a sys regress test. Untested on alpha,
however it has a much better chance of compiling than it did previously.
---

diff --git a/regress/sys/kern/noexec/Makefile b/regress/sys/kern/noexec/Makefile
index 50b2d87b3fe..964fa0017bb 100644
--- a/regress/sys/kern/noexec/Makefile
+++ b/regress/sys/kern/noexec/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2004/03/04 07:24:01 david Exp $
+#	$OpenBSD: Makefile,v 1.13 2014/01/10 13:45:00 jsing Exp $
 
 .if ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \
     ${MACHINE} == "alpha" || \
@@ -6,6 +6,7 @@
     ${MACHINE} == "hppa"
 
 PROG=	noexec
+SRCS=	noexec.c testfly.S
 CFLAGS+=-Wall
 LDSTATIC= ${STATIC}
 REGRESS_TARGETS=	nxtext-mmap	nxtext-mprotect \
diff --git a/regress/sys/kern/noexec/noexec.c b/regress/sys/kern/noexec/noexec.c
index 9597066b837..fe15bd81766 100644
--- a/regress/sys/kern/noexec/noexec.c
+++ b/regress/sys/kern/noexec/noexec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: noexec.c,v 1.13 2013/07/30 15:46:32 kettenis Exp $	*/
+/*	$OpenBSD: noexec.c,v 1.14 2014/01/10 13:45:00 jsing Exp $	*/
 
 /*
  * Copyright (c) 2002,2003 Michael Shalayeff
@@ -279,5 +279,3 @@ main(int argc, char *argv[])
 
 	exit((*func)(p, size));
 }
-
-__asm (".space 8192; .globl  testfly; .type   testfly, @function; testfly: ret; nop; .space 8192");
diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S
new file mode 100644
index 00000000000..7faa0608797
--- /dev/null
+++ b/regress/sys/kern/noexec/testfly.S
@@ -0,0 +1,56 @@
+/*	$OpenBSD: testfly.S,v 1.1 2014/01/10 13:45:00 jsing Exp $	*/
+
+/*
+ * Copyright (c) 2002,2003 Michael Shalayeff
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+
+	.space 8192
+
+#if defined(__amd64__) || defined(__i386__) || \
+    defined(__sparc__) || defined(__sparc64__)
+ENTRY(testfly)
+	ret
+	nop
+#endif
+
+#ifdef __alpha__
+LEAF(testfly, 0)
+	ret	zero,(ra),1
+	nop
+END(testfly)
+#endif
+
+#ifdef __hppa__
+LEAF_ENTRY(testfly)
+	bv	r0(rp)
+	nop
+EXIT(testfly)
+#endif
+
+	.space 8192