diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-01 10:14:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-01 10:14:19 -0700 |
| commit | 8b7054528cd5ac96383aa89315670d74865c8dc2 (patch) | |
| tree | 1f98f85bf3f6d4f7f0cf6f6609a84b9026343bf3 /arch/x86/Kconfig | |
| parent | ecf9b7bfea60ca816b2b44716e3f1dde148ea196 (diff) | |
| parent | 2d17bd24b0169d3fdbf003dfd55af600e9a30553 (diff) | |
| download | linux-8b7054528cd5ac96383aa89315670d74865c8dc2.tar.bz2 | |
Merge tag 'x86_build_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build updates from Borislav Petkov:
- Fix stack protector builds when cross compiling with Clang
- Other Kbuild improvements and fixes
* tag 'x86_build_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/purgatory: Omit use of bin2c
x86/purgatory: Hard-code obj-y in Makefile
x86/build: Remove unused OBJECT_FILES_NON_STANDARD_test_nx.o
x86/Kconfig: Fix CONFIG_CC_HAS_SANE_STACKPROTECTOR when cross compiling with clang
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 52a7f91527fe..17a16bcb174c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -392,8 +392,8 @@ config PGTABLE_LEVELS config CC_HAS_SANE_STACKPROTECTOR bool - default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT - default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC)) + default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) if 64BIT + default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) help We have to make sure stack protector is unconditionally disabled if the compiler produces broken code or if it does not let us control @@ -2010,7 +2010,6 @@ config KEXEC config KEXEC_FILE bool "kexec file based system call" select KEXEC_CORE - select BUILD_BIN2C depends on X86_64 depends on CRYPTO=y depends on CRYPTO_SHA256=y |