Commit 8b705452 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ecf9b7bf 2d17bd24

arch/x86/.gitignore

+0 −2
Original line number Diff line number Diff line
@@ -3,6 +3,4 @@ boot/compressed/vmlinux 
tools/test_get_len

tools/insn_sanity

tools/insn_decoder_test

purgatory/kexec-purgatory.c

purgatory/purgatory.ro

arch/x86/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ KASAN_SANITIZE_sev.o := n 
# by several compilation units. To be safe, disable all instrumentation.

KCSAN_SANITIZE := n



OBJECT_FILES_NON_STANDARD_test_nx.o			:= y



# If instrumentation of this dir is enabled, boot hangs during first second.

# Probably could be more selective here, but note that files related to irqs,

# boot, dumpstack/stacktrace, etc are either non-interesting or can lead to

arch/x86/purgatory/Makefile

+2 −8
Original line number Diff line number Diff line
@@ -73,12 +73,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE 
$(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE

		$(call if_changed,ld)



targets += kexec-purgatory.c

$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk



quiet_cmd_bin2c = BIN2C   $@

      cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@



$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE

	$(call if_changed,bin2c)



obj-$(CONFIG_KEXEC_FILE)	+= kexec-purgatory.o
 
obj-y += kexec-purgatory.o

arch/x86/purgatory/kexec-purgatory.S

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



	.section .rodata, "a"



	.align	8

kexec_purgatory:

	.globl	kexec_purgatory

	.incbin	"arch/x86/purgatory/purgatory.ro"

.Lkexec_purgatory_end:



	.align	8

kexec_purgatory_size:

	.globl	kexec_purgatory_size

	.quad	.Lkexec_purgatory_end - kexec_purgatory