From: deraadt <deraadt@openbsd.org>
Date: Fri, 7 Jun 2024 05:17:34 +0000 (+0000)
Subject: ret-clean is compatible with unhibernate again, due to a fix in
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bbf100254c157335904bc1b2700003048cdffe9e;p=openbsd

ret-clean is compatible with unhibernate again, due to a fix in
LLVM X86RetClean.cpp
issue observed by mglocker, diagnosed by mlarkin, kettenis, guenther.
---

diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 263e7fe8d47..aefa751ee3b 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.136 2024/06/05 20:19:26 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.137 2024/06/07 05:17:34 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