diff options
| author | Siva Mahadevan <siva@FreeBSD.org> | 2026-06-10 22:30:14 +0000 |
|---|---|---|
| committer | Siva Mahadevan <siva@FreeBSD.org> | 2026-06-10 23:30:52 +0000 |
| commit | b61ab2d693c04d4be5468e7db4b03d5777228f95 (patch) | |
| tree | b3d74965f13d2005d374b307243793bc3a20ad5e | |
| parent | 1e25cda7f06923d05e28dac8eb1c1c428a5c92dc (diff) | |
src.opts.mk: enable OPENSSL_KTLS by default on riscv64
1e649491b8567151270095fda3bce8faea394952 enabled KERN_TLS in
riscv/conf/GENERIC, but didn't enable OPENSSL_KTLS.
This passes all testcases in the sys/kern/ssl_sendfile suite and
fixes CI failures seen here:
https://ci.freebsd.org/job/FreeBSD-main-riscv64-test/16606/testReport/sys.kern/ssl_sendfile/
PR: 293810
Fixes: 1e649491b8567151270095fda3bce8faea394952
MFC after: 3 days
Reviewed by: gallatin, ngie
Differential Revision: https://reviews.freebsd.org/D57316
| -rw-r--r-- | share/man/man5/src.conf.5 | 6 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2dd42c572a44..5921a5d7108c 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd April 22, 2026 +.Dd May 28, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1514,12 +1514,12 @@ is set explicitly) Do not include kernel TLS support in OpenSSL. .Pp This is a default setting on -arm/armv7, i386/i386 and riscv/riscv64. +arm/armv7 and i386/i386. .It Va WITH_OPENSSL_KTLS Include kernel TLS support in OpenSSL. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, powerpc/powerpc64 and powerpc/powerpc64le. +amd64/amd64, arm64/aarch64, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITHOUT_PAM Do not build PAM library and modules. .Bf -symbolic diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 1fd63eb0db31..6efc686f0a17 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -346,8 +346,8 @@ BROKEN_OPTIONS+=LOADER_IA32 BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA .endif -# Kernel TLS is enabled by default on amd64, aarch64 and powerpc64* -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" +# Kernel TLS is enabled by default on amd64, aarch64, powerpc64*, and riscv64* +.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" || ${__T:Mriscv64*} != "" __DEFAULT_YES_OPTIONS+=OPENSSL_KTLS .else __DEFAULT_NO_OPTIONS+=OPENSSL_KTLS |