mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/s390/boot/Makefile
..
..
@@ -12,36 +12,60 @@
12
12
 KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)
13
13
 
14
14
 #
15
-# Use -march=z900 for als.c to be able to print an error
15
+# Use minimum architecture for als.c to be able to print an error
16
16
 # message if the kernel is started on a machine which is too old
17
17
 #
18
-ifneq ($(CC_FLAGS_MARCH),-march=z900)
18
+ifndef CONFIG_CC_IS_CLANG
19
+CC_FLAGS_MARCH_MINIMUM := -march=z900
20
+else
21
+CC_FLAGS_MARCH_MINIMUM := -march=z10
22
+endif
23
+
24
+ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM))
19
25
 AFLAGS_REMOVE_head.o		+= $(CC_FLAGS_MARCH)
20
-AFLAGS_head.o			+= -march=z900
26
+AFLAGS_head.o			+= $(CC_FLAGS_MARCH_MINIMUM)
21
27
 AFLAGS_REMOVE_mem.o		+= $(CC_FLAGS_MARCH)
22
-AFLAGS_mem.o			+= -march=z900
28
+AFLAGS_mem.o			+= $(CC_FLAGS_MARCH_MINIMUM)
23
29
 CFLAGS_REMOVE_als.o		+= $(CC_FLAGS_MARCH)
24
-CFLAGS_als.o			+= -march=z900
30
+CFLAGS_als.o			+= $(CC_FLAGS_MARCH_MINIMUM)
25
31
 CFLAGS_REMOVE_sclp_early_core.o	+= $(CC_FLAGS_MARCH)
26
-CFLAGS_sclp_early_core.o	+= -march=z900
32
+CFLAGS_sclp_early_core.o	+= $(CC_FLAGS_MARCH_MINIMUM)
27
33
 endif
28
34
 
29
35
 CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char
30
36
 
31
-obj-y	:= head.o als.o ebcdic.o sclp_early_core.o mem.o
32
-targets	:= bzImage startup.a $(obj-y)
37
+obj-y	:= head.o als.o startup.o mem_detect.o ipl_parm.o ipl_report.o
38
+obj-y	+= string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o
39
+obj-y	+= version.o pgm_check_info.o ctype.o text_dma.o
40
+obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE))	+= uv.o
41
+obj-$(CONFIG_RELOCATABLE)	+= machine_kexec_reloc.o
42
+obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o
43
+targets	:= bzImage startup.a section_cmp.boot.data section_cmp.boot.preserved.data $(obj-y)
33
44
 subdir-	:= compressed
34
45
 
35
46
 OBJECTS := $(addprefix $(obj)/,$(obj-y))
36
47
 
37
-$(obj)/bzImage: $(obj)/compressed/vmlinux FORCE
48
+quiet_cmd_section_cmp = SECTCMP $*
49
+define cmd_section_cmp
50
+	s1=`$(OBJDUMP) -t -j "$*" "$<" | sort | \
51
+		sed -n "/0000000000000000/! s/.*\s$*\s\+//p" | sha256sum`; \
52
+	s2=`$(OBJDUMP) -t -j "$*" "$(word 2,$^)" | sort | \
53
+		sed -n "/0000000000000000/! s/.*\s$*\s\+//p" | sha256sum`; \
54
+	if [ "$$s1" != "$$s2" ]; then \
55
+		echo "error: section $* differs between $< and $(word 2,$^)" >&2; \
56
+		exit 1; \
57
+	fi; \
58
+	touch $@
59
+endef
60
+
61
+$(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE
38
62
 	$(call if_changed,objcopy)
63
+
64
+$(obj)/section_cmp%: vmlinux $(obj)/compressed/vmlinux FORCE
65
+	$(call if_changed,section_cmp)
39
66
 
40
67
 $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE
41
68
 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
42
-
43
-quiet_cmd_ar = AR      $@
44
-      cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(filter $(OBJECTS), $^)
45
69
 
46
70
 $(obj)/startup.a: $(OBJECTS) FORCE
47
71
 	$(call if_changed,ar)
..
..
@@ -49,7 +73,3 @@
49
73
 install:
50
74
 	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
51
75
 	      System.map "$(INSTALL_PATH)"
52
-
53
-chkbss := $(OBJECTS)
54
-chkbss-target := $(obj)/startup.a
55
-include $(srctree)/arch/s390/scripts/Makefile.chkbss