diff options
| author |   deraadt <deraadt@openbsd.org> | 2018-04-27 15:19:32 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2018-04-27 15:19:32 +0000 |
| commit | 1a28440a5817e4c071f8c80853c7b26254eafa50 (patch) | |
| tree | 3cca9f227ac4d9ce0ef36625ccf96110526f771e | |
| parent | trailing whitespace, and move arg checking before pledge (diff) | |
| download | wireguard-openbsd-1a28440a5817e4c071f8c80853c7b26254eafa50.tar.xz wireguard-openbsd-1a28440a5817e4c071f8c80853c7b26254eafa50.zip | |
-fretpoline for non-RAMDISK kernels. Skylake product needs it, and
therefore all other x86 cpus must pay the performance price of the
hazard workaround until Skylake disappears from the ecosystem eventually
like 486. This returns your cpu's performance to pre-inflated performance.
ok mlarkin guenther
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 4a92fc123ac..43e0c4b7e55 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.96 2018/02/09 03:59:15 tb Exp $ +# $OpenBSD: Makefile.amd64,v 1.97 2018/04/27 15:19:32 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -40,6 +40,8 @@ CMACHFLAGS+= -msave-args .endif .if ${IDENT:M-DSMALL_KERNEL} SORTR= cat +.else +CMACHFLAGS+= -mretpoline .endif .if ${COMPILER_VERSION:Mclang} NO_INTEGR_AS= -no-integrated-as diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 0faba5424d5..6f15db530bc 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.122 2018/02/09 03:59:15 tb Exp $ +# $OpenBSD: Makefile.i386,v 1.123 2018/04/27 15:19:32 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -36,6 +36,8 @@ CMACHFLAGS+= -fno-stack-protector .endif .if ${IDENT:M-DSMALL_KERNEL} SORTR= cat +.else +CMACHFLAGS+= -mretpoline .endif .if ${COMPILER_VERSION:Mclang} NO_INTEGR_AS= -no-integrated-as |