write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/arch/s390/Makefile
..
..
@@ -16,19 +16,35 @@
16
16
 KBUILD_CFLAGS_MODULE += -fPIC
17
17
 KBUILD_AFLAGS	+= -m64
18
18
 KBUILD_CFLAGS	+= -m64
19
+ifeq ($(CONFIG_RELOCATABLE),y)
20
+KBUILD_CFLAGS	+= -fPIE
21
+LDFLAGS_vmlinux	:= -pie
22
+endif
19
23
 aflags_dwarf	:= -Wa,-gdwarf-2
20
-KBUILD_AFLAGS_DECOMPRESSOR := -m64 -D__ASSEMBLY__
24
+KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__
21
25
 KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))
22
-KBUILD_CFLAGS_DECOMPRESSOR := -m64 -O2
26
+KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2
23
27
 KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY
24
28
 KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float
25
29
 KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
26
-KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding)
30
+KBUILD_CFLAGS_DECOMPRESSOR += -ffreestanding
31
+KBUILD_CFLAGS_DECOMPRESSOR += -fno-stack-protector
32
+KBUILD_CFLAGS_DECOMPRESSOR += -fPIE
27
33
 KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)
28
34
 KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
29
35
 KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
36
+
37
+ifdef CONFIG_CC_IS_GCC
38
+	ifeq ($(call cc-ifversion, -ge, 1200, y), y)
39
+		ifeq ($(call cc-ifversion, -lt, 1300, y), y)
40
+			KBUILD_CFLAGS += $(call cc-disable-warning, array-bounds)
41
+			KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, array-bounds)
42
+		endif
43
+	endif
44
+endif
45
+
30
46
 UTS_MACHINE	:= s390x
31
-STACK_SIZE	:= 16384
47
+STACK_SIZE	:= $(if $(CONFIG_KASAN),65536,16384)
32
48
 CHECKFLAGS	+= -D__s390__ -D__s390x__
33
49
 
34
50
 export LD_BFD
..
..
@@ -41,6 +57,7 @@
41
57
 mflags-$(CONFIG_MARCH_ZEC12)  := -march=zEC12
42
58
 mflags-$(CONFIG_MARCH_Z13)    := -march=z13
43
59
 mflags-$(CONFIG_MARCH_Z14)    := -march=z14
60
+mflags-$(CONFIG_MARCH_Z15)    := -march=z15
44
61
 
45
62
 export CC_FLAGS_MARCH := $(mflags-y)
46
63
 
..
..
@@ -55,6 +72,7 @@
55
72
 cflags-$(CONFIG_MARCH_ZEC12_TUNE)	+= -mtune=zEC12
56
73
 cflags-$(CONFIG_MARCH_Z13_TUNE)		+= -mtune=z13
57
74
 cflags-$(CONFIG_MARCH_Z14_TUNE)		+= -mtune=z14
75
+cflags-$(CONFIG_MARCH_Z15_TUNE)		+= -mtune=z15
58
76
 
59
77
 cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include
60
78
 
..
..
@@ -112,7 +130,7 @@
112
130
 cfi := $(call as-instr,.cfi_startproc\n.cfi_val_offset 15$(comma)-160\n.cfi_endproc,-DCONFIG_AS_CFI_VAL_OFFSET=1)
113
131
 
114
132
 KBUILD_CFLAGS	+= -mbackchain -msoft-float $(cflags-y)
115
-KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare
133
+KBUILD_CFLAGS	+= -pipe -Wno-sign-compare
116
134
 KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables $(cfi)
117
135
 KBUILD_AFLAGS	+= $(aflags-y) $(cfi)
118
136
 export KBUILD_AFLAGS_DECOMPRESSOR
..
..
@@ -151,7 +169,6 @@
151
169
 
152
170
 vdso_install:
153
171
 	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
154
-	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@
155
172
 
156
173
 archclean:
157
174
 	$(Q)$(MAKE) $(clean)=$(boot)