From: anton <anton@openbsd.org>
Date: Sun, 22 Jan 2023 16:38:36 +0000 (+0000)
Subject: Cope with xonly on amd64 by moving the testfly routine to the rodata
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=58320ac70c006d17c3d8623981cdfe95175bd769;p=openbsd

Cope with xonly on amd64 by moving the testfly routine to the rodata
section.
---

diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S
index dc40440f60a..50ffbc57528 100644
--- a/regress/sys/kern/noexec/testfly.S
+++ b/regress/sys/kern/noexec/testfly.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: testfly.S,v 1.11 2023/01/08 06:56:01 anton Exp $	*/
+/*	$OpenBSD: testfly.S,v 1.12 2023/01/22 16:38:36 anton Exp $	*/
 
 /*
  * Copyright (c) 2002,2003 Michael Shalayeff
@@ -30,18 +30,22 @@
 
 #include <machine/asm.h>
 
+#if !defined(_ASM_TYPE_FUNCTION)
+#define _ASM_TYPE_FUNCTION @function
+#endif
+
 	.space 16384
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) || defined(__amd64__)
 	.section .rodata
 	.globl	testfly
-	.type	testfly,#function
+	.type	testfly,_ASM_TYPE_FUNCTION
 testfly:
 	ret
 END(testfly)
 #endif
 
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__i386__)
 ENTRY(testfly)
 	ret
 END(testfly)