diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-06-07 05:17:35 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-06-07 05:17:35 +0000 |
| commit | f91c2e21ba6fb94fda6e50d0c0e882eab9ef81bf (patch) | |
| tree | 63bf00b57617373a51f1b4ba8d6923cd9c4f3cc1 /sys | |
| parent | 5c338d38019823ff68252e2cd7bed174439fad3b (diff) | |
ret-clean is compatible with unhibernate again, due to a fix in
LLVM X86RetClean.cpp
issue observed by mglocker, diagnosed by mlarkin, kettenis, guenther.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 4 |
1 files changed, 2 insertions, 2 deletions
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 |