moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: fips140: allow building without LTO

Browse Source 
Following "ANDROID: fips140: eliminate crypto-fips.a build step", the
only remaining dependency on LTO is the fact that the part of the module
linker script that merges the text and rodata sections and adds some
symbols is guarded by '#ifdef CONFIG_LTO_CLANG'.

This doesn't actually need to be the case, though.  So guard it by
alternatively IS_ENABLED(CONFIG_CRYPTO_FIPS140_MOD).

Then, remove the dependency of CRYPTO_FIPS140_MOD on LTO_CLANG.

(Note: the android14-6.1 kernel currently has LTO disabled, which is
part of the motivation for this change.  I don't know whether it will
stay that way, though.)

Bug: 188620248
Change-Id: I1aa7b293ac7a793721275e06e3ae40628e26bbc4
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers
2023-01-06 05:07:20 +00:00
committed by Matthias Männich
parent 63f46b45dd
commit ae4ca7a09b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/Kconfig
View File

@@ -35,7 +35,7 @@ config CRYPTO_FIPS
config CRYPTO_FIPS140_MOD
tristate "Enable FIPS 140 cryptographic module"
depends on ARM64 && ARM64_MODULE_PLTS && LTO_CLANG
depends on ARM64 && ARM64_MODULE_PLTS
depends on m
help
This option enables building a loadable module fips140.ko, which

2
scripts/module.lds.S
View File

@@ -62,7 +62,7 @@ SECTIONS {
}
#endif
#ifdef CONFIG_LTO_CLANG
#if defined(CONFIG_LTO_CLANG) || IS_ENABLED(CONFIG_CRYPTO_FIPS140_MOD)
/*
* With CONFIG_LTO_CLANG, LLD always enables -fdata-sections and
* -ffunction-sections, which increases the size of the final module.