From 3cc21fe1f11ef924456da3d20e7f3f259eea972d Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 4 Jun 2024 15:14:45 +0000
Subject: enable -fret-clean on amd64, for libc libcrypto ld.so kernel, and all
 the ssh tools.  The dynamic objects are entirely ret-clean, static binaries
 will contain a blend of cleaning and non-cleaning callers.

---
 src/lib/libcrypto/arch/amd64/Makefile.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index a354105822..0cf212b186 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.27 2024/03/29 11:00:57 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.28 2024/06/04 15:14:45 deraadt Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -83,3 +83,5 @@ GENERATED+=x86_64cpuid.S
 x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl ${EXTRA_PL}
 	(cd ${LCRYPTO_SRC}/${dir} ; \
 		/usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET}
+
+CFLAGS+=-fret-clean
-- 
cgit v1.2.3-55-g6feb