From a6fec130fdc36d7ea9624f3ed92c5de88accf396 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Tue, 26 Mar 2024 19:12:34 +0000
Subject: [PATCH] add cfi instructions to repair this test on amd64 and arm64.
 ok kettenis@

---
 regress/sys/kern/noexec/testfly.S | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/regress/sys/kern/noexec/testfly.S b/regress/sys/kern/noexec/testfly.S
index 50ffbc57528..afe29e6ac37 100644
--- a/regress/sys/kern/noexec/testfly.S
+++ b/regress/sys/kern/noexec/testfly.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: testfly.S,v 1.12 2023/01/22 16:38:36 anton Exp $	*/
+/*	$OpenBSD: testfly.S,v 1.13 2024/03/26 19:12:34 miod Exp $	*/
 
 /*
  * Copyright (c) 2002,2003 Michael Shalayeff
@@ -36,11 +36,22 @@
 
 	.space 16384
 
-#if defined(__aarch64__) || defined(__amd64__)
+#if defined(__aarch64__)
 	.section .rodata
 	.globl	testfly
 	.type	testfly,_ASM_TYPE_FUNCTION
 testfly:
+	bti c
+	ret
+END(testfly)
+#endif
+
+#if defined(__amd64__)
+	.section .rodata
+	.globl	testfly
+	.type	testfly,_ASM_TYPE_FUNCTION
+testfly:
+	endbr64
 	ret
 END(testfly)
 #endif
-- 
2.20.1