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
3737 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111219
3838 KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow-non-kprintf)
3939 KBUILD_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.
51+KBUILD_CFLAGS += $(call cc-disable-warning, default-const-init-unsafe)
4052 else
4153
4254 # gcc inanely warns about local variables called 'main'
scripts/Makefile.vmlinux+2−2
@@ -94,10 +94,10 @@ $(vmlinux-final): $(RESOLVE_BTFIDS) · 93 unmodified lines
9494 endif
9595
9696 ifdef CONFIG_BUILDTIME_TABLE_SORT
97−vmlinux: scripts/sorttable
97+$(vmlinux-final): scripts/sorttable
9898 endif
9999
100−# module.builtin.ranges
100+# modules.builtin.ranges
101101 # ---------------------------------------------------------------------------
102102 ifdef CONFIG_BUILTIN_MODULE_RANGES
103103 __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
7373
7474 targets += vmlinux.o
7575
76−# module.builtin.modinfo
76+# modules.builtin.modinfo
7777 # ---------------------------------------------------------------------------
7878
7979 OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary
@@ -82,7 +82,7 @@ targets += modules.builtin.modinfo · 2 unmodified lines
8282 modules.builtin.modinfo: vmlinux.o FORCE
8383 $(call if_changed,objcopy)
8484
85−# module.builtin
85+# modules.builtin
8686 # ---------------------------------------------------------------------------
8787
8888 # 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
1616 Source2: diff.patch
1717 Provides: kernel-%{KERNELRELEASE}
1818 BuildRequires: bc binutils bison dwarves
19+BuildRequires: (elfutils-devel or libdw-devel)
1920 BuildRequires: (elfutils-libelf-devel or libelf-devel) flex
2021 BuildRequires: gcc make openssl openssl-devel perl python3 rsync
2122
scripts/package/mkdebian+1−1
@@ -210,7 +210,7 @@ Rules-Requires-Root: no · 209 unmodified lines
210210 Build-Depends: debhelper-compat (= 12)
211211 Build-Depends-Arch: bc, bison, flex,
212212 gcc-${host_gnu} <!pkg.${sourcename}.nokernelheaders>,
213− kmod, libelf-dev:native,
213+ kmod, libdw-dev:native, libelf-dev:native,
214214 libssl-dev:native, libssl-dev <!pkg.${sourcename}.nokernelheaders>,
215215 python3:native, rsync
216216 Homepage: https://www.kernel.org/