History

Merge tag 'v6.15-rc7' into x86/core, to pick up fixes

Pick up build fixes from upstream to make this tree more testable.

Ingo Molnar committed 1 year ago

Commit 412751a2 parents e95534e a5806cd302 files · +3046 −1383Browse files

Showing the changes to scripts (5 of 302 files). Show all

Unified · Split

5 files
  1. scripts/Makefile.extrawarn +12 −0
  2. scripts/Makefile.vmlinux +2 −2
  3. scripts/Makefile.vmlinux_o +2 −2
  4. scripts/package/kernel.spec +1 −0
  5. scripts/package/mkdebian +1 −1
scripts/Makefile.extrawarn+12−0
@@ -37,6 +37,18 @@ KBUILD_CFLAGS += -Wno-gnu · 36 unmodified lines
37# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=11121937# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111219
38KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow-non-kprintf)38KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow-non-kprintf)
39KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation-non-kprintf)39KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation-non-kprintf)
40
41# Clang may emit a warning when a const variable, such as the dummy variables
42# in typecheck(), or const member of an aggregate type are not initialized,
43# which can result in unexpected behavior. However, in many audited cases of
44# the "field" variant of the warning, this is intentional because the field is
45# never used within a particular call path, the field is within a union with
46# other non-const members, or the containing object is not const so the field
47# can be modified via memcpy() / memset(). While the variable warning also gets
48# disabled with this same switch, there should not be too much coverage lost
49# because -Wuninitialized will still flag when an uninitialized const variable
50# is used.
51KBUILD_CFLAGS += $(call cc-disable-warning, default-const-init-unsafe)
40else52else
41 53
42# gcc inanely warns about local variables called 'main'54# gcc inanely warns about local variables called 'main'
scripts/Makefile.vmlinux+2−2
@@ -94,10 +94,10 @@ $(vmlinux-final): $(RESOLVE_BTFIDS) · 93 unmodified lines
94endif94endif
95 95
96ifdef CONFIG_BUILDTIME_TABLE_SORT96ifdef CONFIG_BUILDTIME_TABLE_SORT
97vmlinux: scripts/sorttable97$(vmlinux-final): scripts/sorttable
98endif98endif
99 99
100# module.builtin.ranges100# modules.builtin.ranges
101# ---------------------------------------------------------------------------101# ---------------------------------------------------------------------------
102ifdef CONFIG_BUILTIN_MODULE_RANGES102ifdef CONFIG_BUILTIN_MODULE_RANGES
103__default: modules.builtin.ranges103__default: modules.builtin.ranges
scripts/Makefile.vmlinux_o+2−2
@@ -73,7 +73,7 @@ vmlinux.o: $(initcalls-lds) vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE · 72 unmodified lines
73 73
74targets += vmlinux.o74targets += vmlinux.o
75 75
76# module.builtin.modinfo76# modules.builtin.modinfo
77# ---------------------------------------------------------------------------77# ---------------------------------------------------------------------------
78 78
79OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary79OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary
@@ -82,7 +82,7 @@ targets += modules.builtin.modinfo · 2 unmodified lines
82modules.builtin.modinfo: vmlinux.o FORCE82modules.builtin.modinfo: vmlinux.o FORCE
83 $(call if_changed,objcopy)83 $(call if_changed,objcopy)
84 84
85# module.builtin85# modules.builtin
86# ---------------------------------------------------------------------------86# ---------------------------------------------------------------------------
87 87
88# The second line aids cases where multiple modules share the same object.88# The second line aids cases where multiple modules share the same object.
scripts/package/kernel.spec+1−0
@@ -16,6 +16,7 @@ Source1: config · 15 unmodified lines
16Source2: diff.patch16Source2: diff.patch
17Provides: kernel-%{KERNELRELEASE}17Provides: kernel-%{KERNELRELEASE}
18BuildRequires: bc binutils bison dwarves18BuildRequires: bc binutils bison dwarves
19BuildRequires: (elfutils-devel or libdw-devel)
19BuildRequires: (elfutils-libelf-devel or libelf-devel) flex20BuildRequires: (elfutils-libelf-devel or libelf-devel) flex
20BuildRequires: gcc make openssl openssl-devel perl python3 rsync21BuildRequires: gcc make openssl openssl-devel perl python3 rsync
21 22
scripts/package/mkdebian+1−1
@@ -210,7 +210,7 @@ Rules-Requires-Root: no · 209 unmodified lines
210Build-Depends: debhelper-compat (= 12)210Build-Depends: debhelper-compat (= 12)
211Build-Depends-Arch: bc, bison, flex,211Build-Depends-Arch: bc, bison, flex,
212 gcc-${host_gnu} <!pkg.${sourcename}.nokernelheaders>,212 gcc-${host_gnu} <!pkg.${sourcename}.nokernelheaders>,
213 kmod, libelf-dev:native,213 kmod, libdw-dev:native, libelf-dev:native,
214 libssl-dev:native, libssl-dev <!pkg.${sourcename}.nokernelheaders>,214 libssl-dev:native, libssl-dev <!pkg.${sourcename}.nokernelheaders>,
215 python3:native, rsync215 python3:native, rsync
216Homepage: https://www.kernel.org/216Homepage: https://www.kernel.org/