hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/x86/purgatory/Makefile
....@@ -9,24 +9,32 @@
99 $(obj)/string.o: $(srctree)/arch/x86/boot/compressed/string.c FORCE
1010 $(call if_changed_rule,cc_o_c)
1111
12
-$(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
12
+$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
1313 $(call if_changed_rule,cc_o_c)
1414
15
-LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib
16
-targets += purgatory.ro
15
+CFLAGS_sha256.o := -D__DISABLE_EXPORTS
16
+
17
+# When linking purgatory.ro with -r unresolved symbols are not checked,
18
+# also link a purgatory.chk binary without -r to check for unresolved symbols.
19
+PURGATORY_LDFLAGS := -e purgatory_start -nostdlib -z nodefaultlib
20
+LDFLAGS_purgatory.ro := -r $(PURGATORY_LDFLAGS)
21
+LDFLAGS_purgatory.chk := $(PURGATORY_LDFLAGS)
22
+targets += purgatory.ro purgatory.chk
1723
1824 # Sanitizer, etc. runtimes are unavailable and cannot be linked here.
1925 GCOV_PROFILE := n
2026 KASAN_SANITIZE := n
2127 UBSAN_SANITIZE := n
28
+KCSAN_SANITIZE := n
2229 KCOV_INSTRUMENT := n
2330
2431 # These are adjustments to the compiler flags used for objects that
2532 # make up the standalone purgatory.ro
2633
27
-PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel
28
-PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss
34
+PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel $(CC_FLAGS_CFI)
35
+PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss -g0
2936 PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) -DDISABLE_BRANCH_PROFILING
37
+PURGATORY_CFLAGS += -fno-stack-protector
3038
3139 # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That
3240 # in turn leaves some undefined symbols like __fentry__ in purgatory and not
....@@ -56,7 +64,13 @@
5664 CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE)
5765 CFLAGS_string.o += $(PURGATORY_CFLAGS)
5866
67
+AFLAGS_REMOVE_setup-x86_$(BITS).o += -Wa,-gdwarf-2
68
+AFLAGS_REMOVE_entry64.o += -Wa,-gdwarf-2
69
+
5970 $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
71
+ $(call if_changed,ld)
72
+
73
+$(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE
6074 $(call if_changed,ld)
6175
6276 targets += kexec-purgatory.c
....@@ -64,7 +78,7 @@
6478 quiet_cmd_bin2c = BIN2C $@
6579 cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
6680
67
-$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE
81
+$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
6882 $(call if_changed,bin2c)
6983
7084 obj-$(CONFIG_KEXEC_FILE) += kexec-purgatory.o