From: deraadt <deraadt@openbsd.org>
Date: Wed, 5 Jun 2024 20:19:26 +0000 (+0000)
Subject: disable -fret-clean in the kernel until the returns_twice situation is handled
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7cdbf193cb242c6b59f2c6001f89da801c7780fe;p=openbsd

disable -fret-clean in the kernel until the returns_twice situation is handled
---

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index b369f9476d6..263e7fe8d47 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.135 2024/06/04 15:14:45 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.136 2024/06/05 20:19:26 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -73,7 +73,7 @@ CMACHFLAGS+=	-mno-retpoline -fcf-protection=none
 .endif
 .else
 CMACHFLAGS+=	-mretpoline-external-thunk -fcf-protection=branch
-CMACHFLAGS+=	-fret-clean
+#CMACHFLAGS+=	-fret-clean
 .endif
 .if ${COMPILER_VERSION:Mclang}
 NO_INTEGR_AS=	-no-integrated-as