Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- remove unneeded use of cc-option, cc-disable-warning, cc-ldoption
- exclude tracked files from .gitignore
- re-enable -Wint-in-bool-context warning
- refactor samples/Makefile
- stop building immediately if syncconfig fails
- do not sprinkle error messages when $(CC) does not exist
- move arch/alpha/defconfig to the configs subdirectory
- remove crappy header search path manipulation
- add comment lines to .config to clarify the end of menu blocks
- check uniqueness of module names (adding new warnings intentionally)
* tag 'kbuild-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (24 commits)
kconfig: use 'else ifneq' for Makefile to improve readability
kbuild: check uniqueness of module names
kconfig: Terminate menu blocks with a comment in the generated config
kbuild: add LICENSES to KBUILD_ALLDIRS
kbuild: remove 'addtree' and 'flags' magic for header search paths
treewide: prefix header search paths with $(srctree)/
media: prefix header search paths with $(srctree)/
media: remove unneeded header search paths
alpha: move arch/alpha/defconfig to arch/alpha/configs/defconfig
kbuild: terminate Kconfig when $(CC) or $(LD) is missing
kbuild: turn auto.conf.cmd into a mandatory include file
.gitignore: exclude .get_maintainer.ignore and .gitattributes
kbuild: add all Clang-specific flags unconditionally
kbuild: Don't try to add '-fcatch-undefined-behavior' flag
kbuild: add some extra warning flags unconditionally
kbuild: add -Wvla flag unconditionally
arch: remove dangling asm-generic wrappers
samples: guard sub-directories with CONFIG options
kbuild: re-enable int-in-bool-context warning
MAINTAINERS: kbuild: Add pattern for scripts/*vmlinux*
...
+178
-171
+5
-3
.gitignore
+5
-3
.gitignore
···
81
81
/tar-install/
82
82
83
83
#
84
-
# git files that we don't want to ignore even if they are dot-files
84
+
# We don't want to ignore the following even if they are dot-files
85
85
#
86
+
!.clang-format
87
+
!.cocciconfig
88
+
!.get_maintainer.ignore
89
+
!.gitattributes
86
90
!.gitignore
87
91
!.mailmap
88
-
!.cocciconfig
89
-
!.clang-format
90
92
91
93
#
92
94
# Generated include files
+1
MAINTAINERS
+1
MAINTAINERS
+10
-11
Makefile
+10
-11
Makefile
···
537
537
# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
538
538
# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
539
539
# and from include/config/auto.conf.cmd to detect the compiler upgrade.
540
-
CC_VERSION_TEXT = $(shell $(CC) --version | head -n 1)
540
+
CC_VERSION_TEXT = $(shell $(CC) --version 2>/dev/null | head -n 1)
541
541
542
542
ifeq ($(config-targets),1)
543
543
# ===========================================================================
···
651
651
# Read in dependencies to all Kconfig* files, make sure to run syncconfig if
652
652
# changes are detected. This should be included after arch/$(SRCARCH)/Makefile
653
653
# because some architectures define CROSS_COMPILE there.
654
-
-include include/config/auto.conf.cmd
654
+
include include/config/auto.conf.cmd
655
655
656
656
$(KCONFIG_CONFIG):
657
657
@echo >&2 '***'
···
692
692
KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
693
693
KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
694
694
KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
695
-
KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
696
695
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
697
696
698
697
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
···
731
732
KBUILD_CFLAGS += $(stackp-flags-y)
732
733
733
734
ifdef CONFIG_CC_IS_CLANG
734
-
KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
735
-
KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
736
-
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
735
+
KBUILD_CPPFLAGS += -Qunused-arguments
736
+
KBUILD_CFLAGS += -Wno-format-invalid-specifier
737
+
KBUILD_CFLAGS += -Wno-gnu
737
738
# Quiet clang warning: comparison of unsigned expression < 0 is always false
738
-
KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
739
+
KBUILD_CFLAGS += -Wno-tautological-compare
739
740
# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
740
741
# source of a reference will be _MergedGlobals and not on of the whitelisted names.
741
742
# See modpost pattern 2
742
-
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
743
-
KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
743
+
KBUILD_CFLAGS += -mno-global-merge
744
744
else
745
745
746
746
# These warnings generated too much noise in a regular build.
···
840
842
KBUILD_CFLAGS += -Wdeclaration-after-statement
841
843
842
844
# Variable Length Arrays (VLAs) should not be used anywhere in the kernel
843
-
KBUILD_CFLAGS += $(call cc-option,-Wvla)
845
+
KBUILD_CFLAGS += -Wvla
844
846
845
847
# disable pointer signed / unsigned warnings in gcc 4.0
846
848
KBUILD_CFLAGS += -Wno-pointer-sign
···
1016
1018
export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
1017
1019
export LDFLAGS_vmlinux
1018
1020
# used by scripts/package/Makefile
1019
-
export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch include scripts tools)
1021
+
export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) LICENSES arch include scripts tools)
1020
1022
1021
1023
vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)
1022
1024
···
1288
1290
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
1289
1291
@$(kecho) ' Building modules, stage 2.';
1290
1292
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
1293
+
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh
1291
1294
1292
1295
modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
1293
1296
$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin
+2
arch/alpha/Makefile
+2
arch/alpha/Makefile
arch/alpha/defconfig
arch/alpha/configs/defconfig
arch/alpha/defconfig
arch/alpha/configs/defconfig
-4
arch/csky/include/asm/Kbuild
-4
arch/csky/include/asm/Kbuild
···
1
1
generic-y += asm-offsets.h
2
2
generic-y += bugs.h
3
-
generic-y += clkdev.h
4
3
generic-y += compat.h
5
4
generic-y += current.h
6
5
generic-y += delay.h
···
28
29
generic-y += mm-arch-hooks.h
29
30
generic-y += mmiowb.h
30
31
generic-y += module.h
31
-
generic-y += mutex.h
32
32
generic-y += pci.h
33
33
generic-y += percpu.h
34
34
generic-y += preempt.h
35
35
generic-y += qrwlock.h
36
-
generic-y += scatterlist.h
37
36
generic-y += sections.h
38
37
generic-y += serial.h
39
-
generic-y += shm.h
40
38
generic-y += timex.h
41
39
generic-y += topology.h
42
40
generic-y += trace_clock.h
-1
arch/h8300/include/asm/Kbuild
-1
arch/h8300/include/asm/Kbuild
+1
-1
arch/ia64/kernel/Makefile.gate
+1
-1
arch/ia64/kernel/Makefile.gate
···
11
11
cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
12
12
13
13
GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
14
-
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
14
+
-Wl,--hash-style=sysv
15
15
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
16
16
$(call if_changed,gate)
17
17
+1
-1
arch/mips/pnx833x/Platform
+1
-1
arch/mips/pnx833x/Platform
···
1
1
# NXP STB225
2
2
platform-$(CONFIG_SOC_PNX833X) += pnx833x/
3
-
cflags-$(CONFIG_SOC_PNX833X) += -Iarch/mips/include/asm/mach-pnx833x
3
+
cflags-$(CONFIG_SOC_PNX833X) += -I $(srctree)/arch/mips/include/asm/mach-pnx833x
4
4
load-$(CONFIG_NXP_STB220) += 0xffffffff80001000
5
5
load-$(CONFIG_NXP_STB225) += 0xffffffff80001000
-3
arch/nds32/include/asm/Kbuild
-3
arch/nds32/include/asm/Kbuild
···
4
4
generic-y += bug.h
5
5
generic-y += bugs.h
6
6
generic-y += checksum.h
7
-
generic-y += clkdev.h
8
7
generic-y += cmpxchg.h
9
8
generic-y += compat.h
10
-
generic-y += cputime.h
11
9
generic-y += device.h
12
10
generic-y += div64.h
13
11
generic-y += dma.h
···
24
26
generic-y += kmap_types.h
25
27
generic-y += kprobes.h
26
28
generic-y += kvm_para.h
27
-
generic-y += limits.h
28
29
generic-y += local.h
29
30
generic-y += local64.h
30
31
generic-y += mm-arch-hooks.h
+1
-1
arch/powerpc/Makefile
+1
-1
arch/powerpc/Makefile
···
211
211
212
212
asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)
213
213
214
-
KBUILD_CPPFLAGS += -Iarch/$(ARCH) $(asinstr)
214
+
KBUILD_CPPFLAGS += -I $(srctree)/arch/$(ARCH) $(asinstr)
215
215
KBUILD_AFLAGS += $(AFLAGS-y)
216
216
KBUILD_CFLAGS += $(call cc-option,-msoft-float)
217
217
KBUILD_CFLAGS += -pipe $(CFLAGS-y)
-4
arch/riscv/include/asm/Kbuild
-4
arch/riscv/include/asm/Kbuild
···
1
1
generic-y += bugs.h
2
2
generic-y += checksum.h
3
3
generic-y += compat.h
4
-
generic-y += cputime.h
5
4
generic-y += device.h
6
5
generic-y += div64.h
7
6
generic-y += extable.h
···
11
12
generic-y += exec.h
12
13
generic-y += fb.h
13
14
generic-y += hardirq.h
14
-
generic-y += hash.h
15
15
generic-y += hw_irq.h
16
16
generic-y += irq_regs.h
17
17
generic-y += irq_work.h
···
20
22
generic-y += local.h
21
23
generic-y += local64.h
22
24
generic-y += mm-arch-hooks.h
23
-
generic-y += mutex.h
24
25
generic-y += percpu.h
25
26
generic-y += preempt.h
26
-
generic-y += scatterlist.h
27
27
generic-y += sections.h
28
28
generic-y += serial.h
29
29
generic-y += shmparam.h
+2
-2
arch/sh/Makefile
+2
-2
arch/sh/Makefile
···
191
191
drivers-y += arch/sh/drivers/
192
192
drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
193
193
194
-
cflags-y += $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \
195
-
$(foreach d, $(machdir-y), -Iarch/sh/include/$(d))
194
+
cflags-y += $(foreach d, $(cpuincdir-y), -I $(srctree)/arch/sh/include/$(d)) \
195
+
$(foreach d, $(machdir-y), -I $(srctree)/arch/sh/include/$(d))
196
196
197
197
KBUILD_CFLAGS += -pipe $(cflags-y)
198
198
KBUILD_CPPFLAGS += $(cflags-y)
+1
-2
arch/sh/kernel/vsyscall/Makefile
+1
-2
arch/sh/kernel/vsyscall/Makefile
···
15
15
16
16
export CPPFLAGS_vsyscall.lds += -P -C -Ush
17
17
18
-
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
19
-
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
18
+
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 -Wl,--hash-style=sysv
20
19
21
20
SYSCFLAGS_vsyscall-trapa.so = $(vsyscall-flags)
22
21
+1
-1
arch/x86/kernel/Makefile
+1
-1
arch/x86/kernel/Makefile
+1
-1
arch/x86/mm/Makefile
+1
-1
arch/x86/mm/Makefile
+1
-1
arch/xtensa/boot/lib/Makefile
+1
-1
arch/xtensa/boot/lib/Makefile
-1
arch/xtensa/include/asm/Kbuild
-1
arch/xtensa/include/asm/Kbuild
+1
-1
drivers/hid/intel-ish-hid/Makefile
+1
-1
drivers/hid/intel-ish-hid/Makefile
+2
-2
drivers/media/common/b2c2/Makefile
+2
-2
drivers/media/common/b2c2/Makefile
···
4
4
b2c2-flexcop-objs += flexcop-hw-filter.o
5
5
obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
6
6
7
-
ccflags-y += -Idrivers/media/dvb-frontends/
8
-
ccflags-y += -Idrivers/media/tuners/
7
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
8
+
ccflags-y += -I $(srctree)/drivers/media/tuners/
-2
drivers/media/dvb-frontends/cxd2880/Makefile
-2
drivers/media/dvb-frontends/cxd2880/Makefile
+1
-1
drivers/media/i2c/smiapp/Makefile
+1
-1
drivers/media/i2c/smiapp/Makefile
+1
-2
drivers/media/mmc/siano/Makefile
+1
-2
drivers/media/mmc/siano/Makefile
+1
-1
drivers/media/pci/b2c2/Makefile
+1
-1
drivers/media/pci/b2c2/Makefile
+2
-3
drivers/media/pci/bt8xx/Makefile
+2
-3
drivers/media/pci/bt8xx/Makefile
···
6
6
obj-$(CONFIG_VIDEO_BT848) += bttv.o
7
7
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
8
8
9
-
ccflags-y += -Idrivers/media/dvb-frontends
10
-
ccflags-y += -Idrivers/media/common
11
-
ccflags-y += -Idrivers/media/tuners
9
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
10
+
ccflags-y += -I $(srctree)/drivers/media/tuners
+2
-2
drivers/media/pci/cx18/Makefile
+2
-2
drivers/media/pci/cx18/Makefile
···
9
9
obj-$(CONFIG_VIDEO_CX18) += cx18.o
10
10
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
11
11
12
-
ccflags-y += -Idrivers/media/dvb-frontends
13
-
ccflags-y += -Idrivers/media/tuners
12
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
13
+
ccflags-y += -I $(srctree)/drivers/media/tuners
+2
-2
drivers/media/pci/cx23885/Makefile
+2
-2
drivers/media/pci/cx23885/Makefile
···
8
8
obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
9
9
obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
10
10
11
-
ccflags-y += -Idrivers/media/tuners
12
-
ccflags-y += -Idrivers/media/dvb-frontends
11
+
ccflags-y += -I $(srctree)/drivers/media/tuners
12
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
13
13
14
14
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+2
-2
drivers/media/pci/cx88/Makefile
+2
-2
drivers/media/pci/cx88/Makefile
···
10
10
obj-$(CONFIG_VIDEO_CX88_BLACKBIRD) += cx88-blackbird.o
11
11
obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
12
12
obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
13
-
ccflags-y += -Idrivers/media/tuners
14
-
ccflags-y += -Idrivers/media/dvb-frontends
13
+
ccflags-y += -I $(srctree)/drivers/media/tuners
14
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+2
-2
drivers/media/pci/ddbridge/Makefile
+2
-2
drivers/media/pci/ddbridge/Makefile
+1
-1
drivers/media/pci/dm1105/Makefile
+1
-1
drivers/media/pci/dm1105/Makefile
+1
-1
drivers/media/pci/mantis/Makefile
+1
-1
drivers/media/pci/mantis/Makefile
+1
-1
drivers/media/pci/netup_unidvb/Makefile
+1
-1
drivers/media/pci/netup_unidvb/Makefile
+2
-2
drivers/media/pci/ngene/Makefile
+2
-2
drivers/media/pci/ngene/Makefile
+1
-1
drivers/media/pci/pluto2/Makefile
+1
-1
drivers/media/pci/pluto2/Makefile
+2
-2
drivers/media/pci/pt1/Makefile
+2
-2
drivers/media/pci/pt1/Makefile
+2
-2
drivers/media/pci/pt3/Makefile
+2
-2
drivers/media/pci/pt3/Makefile
+2
-3
drivers/media/pci/smipcie/Makefile
+2
-3
drivers/media/pci/smipcie/Makefile
+2
-2
drivers/media/pci/ttpci/Makefile
+2
-2
drivers/media/pci/ttpci/Makefile
···
18
18
obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
19
19
obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
20
20
21
-
ccflags-y += -Idrivers/media/dvb-frontends/
22
-
ccflags-y += -Idrivers/media/tuners
21
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
22
+
ccflags-y += -I $(srctree)/drivers/media/tuners
+2
-3
drivers/media/platform/sti/c8sectpfe/Makefile
+2
-3
drivers/media/platform/sti/c8sectpfe/Makefile
···
4
4
5
5
obj-$(CONFIG_DVB_C8SECTPFE) += c8sectpfe.o
6
6
7
-
ccflags-y += -Idrivers/media/common
8
-
ccflags-y += -Idrivers/media/dvb-frontends/
9
-
ccflags-y += -Idrivers/media/tuners/
7
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
8
+
ccflags-y += -I $(srctree)/drivers/media/tuners/
-2
drivers/media/radio/Makefile
-2
drivers/media/radio/Makefile
+1
-3
drivers/media/spi/Makefile
+1
-3
drivers/media/spi/Makefile
···
1
1
obj-$(CONFIG_VIDEO_GS1662) += gs1662.o
2
2
obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o
3
3
4
-
ccflags-y += -Idrivers/media/dvb-core
5
-
ccflags-y += -Idrivers/media/dvb-frontends
6
-
ccflags-y += -Idrivers/media/dvb-frontends/cxd2880
4
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/cxd2880
+1
-1
drivers/media/usb/as102/Makefile
+1
-1
drivers/media/usb/as102/Makefile
+2
-2
drivers/media/usb/au0828/Makefile
+2
-2
drivers/media/usb/au0828/Makefile
···
11
11
12
12
obj-$(CONFIG_VIDEO_AU0828) += au0828.o
13
13
14
-
ccflags-y += -Idrivers/media/tuners
15
-
ccflags-y += -Idrivers/media/dvb-frontends
14
+
ccflags-y += -I $(srctree)/drivers/media/tuners
15
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
16
16
17
17
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+1
-1
drivers/media/usb/b2c2/Makefile
+1
-1
drivers/media/usb/b2c2/Makefile
+2
-3
drivers/media/usb/cx231xx/Makefile
+2
-3
drivers/media/usb/cx231xx/Makefile
···
9
9
obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o
10
10
obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
11
11
12
-
ccflags-y += -Idrivers/media/tuners
13
-
ccflags-y += -Idrivers/media/dvb-frontends
14
-
ccflags-y += -Idrivers/media/usb/dvb-usb
12
+
ccflags-y += -I $(srctree)/drivers/media/tuners
13
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+2
-2
drivers/media/usb/em28xx/Makefile
+2
-2
drivers/media/usb/em28xx/Makefile
···
11
11
obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o
12
12
obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
13
13
14
-
ccflags-y += -Idrivers/media/tuners
15
-
ccflags-y += -Idrivers/media/dvb-frontends
14
+
ccflags-y += -I $(srctree)/drivers/media/tuners
15
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+1
-1
drivers/media/usb/go7007/Makefile
+1
-1
drivers/media/usb/go7007/Makefile
+2
-2
drivers/media/usb/pvrusb2/Makefile
+2
-2
drivers/media/usb/pvrusb2/Makefile
+1
-1
drivers/media/usb/siano/Makefile
+1
-1
drivers/media/usb/siano/Makefile
+2
-2
drivers/media/usb/tm6000/Makefile
+2
-2
drivers/media/usb/tm6000/Makefile
···
10
10
obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
11
11
obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
12
12
13
-
ccflags-y += -Idrivers/media/tuners
14
-
ccflags-y += -Idrivers/media/dvb-frontends
13
+
ccflags-y += -I $(srctree)/drivers/media/tuners
14
+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+1
-1
drivers/media/usb/ttusb-budget/Makefile
+1
-1
drivers/media/usb/ttusb-budget/Makefile
-2
drivers/media/usb/usbvision/Makefile
-2
drivers/media/usb/usbvision/Makefile
+1
-1
drivers/net/ethernet/chelsio/libcxgb/Makefile
+1
-1
drivers/net/ethernet/chelsio/libcxgb/Makefile
+3
-3
drivers/target/iscsi/cxgbit/Makefile
+3
-3
drivers/target/iscsi/cxgbit/Makefile
···
1
1
# SPDX-License-Identifier: GPL-2.0
2
-
ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4
3
-
ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb
4
-
ccflags-y += -Idrivers/target/iscsi
2
+
ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4
3
+
ccflags-y += -I $(srctree)/drivers/net/ethernet/chelsio/libcxgb
4
+
ccflags-y += -I $(srctree)/drivers/target/iscsi
5
5
6
6
obj-$(CONFIG_ISCSI_TARGET_CXGB4) += cxgbit.o
7
7
+1
-1
drivers/usb/storage/Makefile
+1
-1
drivers/usb/storage/Makefile
+1
-2
fs/ocfs2/dlm/Makefile
+1
-2
fs/ocfs2/dlm/Makefile
+1
-1
fs/ocfs2/dlmfs/Makefile
+1
-1
fs/ocfs2/dlmfs/Makefile
+2
-2
fs/xfs/Makefile
+2
-2
fs/xfs/Makefile
+1
-1
net/bpfilter/Makefile
+1
-1
net/bpfilter/Makefile
+20
-4
samples/Makefile
+20
-4
samples/Makefile
···
1
+
# SPDX-License-Identifier: GPL-2.0
1
2
# Makefile for Linux samples code
2
3
3
-
obj-y += kobject/ kprobes/ trace_events/ livepatch/ \
4
-
hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
5
-
configfs/ connector/ v4l/ trace_printk/ \
6
-
vfio-mdev/ vfs/ qmi/ binderfs/ pidfd/
4
+
obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs/
5
+
obj-$(CONFIG_SAMPLE_CONFIGFS) += configfs/
6
+
obj-$(CONFIG_SAMPLE_CONNECTOR) += connector/
7
+
subdir-y += hidraw
8
+
obj-$(CONFIG_SAMPLE_HW_BREAKPOINT) += hw_breakpoint/
9
+
obj-$(CONFIG_SAMPLE_KDB) += kdb/
10
+
obj-$(CONFIG_SAMPLE_KFIFO) += kfifo/
11
+
obj-$(CONFIG_SAMPLE_KOBJECT) += kobject/
12
+
obj-$(CONFIG_SAMPLE_KPROBES) += kprobes/
13
+
obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch/
14
+
subdir-y += pidfd
15
+
obj-$(CONFIG_SAMPLE_QMI_CLIENT) += qmi/
16
+
obj-$(CONFIG_SAMPLE_RPMSG_CLIENT) += rpmsg/
17
+
subdir-$(CONFIG_SAMPLE_SECCOMP) += seccomp
18
+
obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/
19
+
obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/
20
+
obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/
21
+
obj-y += vfio-mdev/
22
+
subdir-$(CONFIG_SAMPLE_VFS) += vfs
+1
-1
samples/seccomp/Makefile
+1
-1
samples/seccomp/Makefile
···
1
1
# SPDX-License-Identifier: GPL-2.0
2
2
ifndef CROSS_COMPILE
3
-
hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct user-trap
3
+
hostprogs-y := bpf-fancy dropper bpf-direct user-trap
4
4
5
5
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
6
6
HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include
+1
-1
samples/vfs/Makefile
+1
-1
samples/vfs/Makefile
-8
scripts/Kbuild.include
-8
scripts/Kbuild.include
···
192
192
# $(Q)$(MAKE) $(hdr-inst)=dir
193
193
hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
194
194
195
-
# Prefix -I with $(srctree) if it is not an absolute path.
196
-
# skip if -I has no parameter
197
-
addtree = $(if $(patsubst -I%,%,$(1)), \
198
-
$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
199
-
200
-
# Find all -I options and call addtree
201
-
flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
202
-
203
195
# echo command.
204
196
# Short version is used, if $(quiet) equals `quiet_', otherwise full one.
205
197
echo-cmd = $(if $($(quiet)cmd_$(1)),\
+8
scripts/Kconfig.include
+8
scripts/Kconfig.include
···
18
18
# Return y if <command> exits with 0, n otherwise
19
19
success = $(if-success,$(1),y,n)
20
20
21
+
# $(failure,<command>)
22
+
# Return n if <command> exits with 0, y otherwise
23
+
failure = $(if-success,$(1),n,y)
24
+
21
25
# $(cc-option,<flag>)
22
26
# Return y if the compiler supports <flag>, n otherwise
23
27
cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null)
···
29
25
# $(ld-option,<flag>)
30
26
# Return y if the linker supports <flag>, n otherwise
31
27
ld-option = $(success,$(LD) -v $(1))
28
+
29
+
# check if $(CC) and $(LD) exist
30
+
$(error-if,$(failure,command -v $(CC)),compiler '$(CC)' not found)
31
+
$(error-if,$(failure,command -v $(LD)),linker '$(LD)' not found)
32
32
33
33
# gcc version including patch level
34
34
gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh $(CC))
+13
-12
scripts/Makefile.extrawarn
+13
-12
scripts/Makefile.extrawarn
···
23
23
warning-1 := -Wextra -Wunused -Wno-unused-parameter
24
24
warning-1 += -Wmissing-declarations
25
25
warning-1 += -Wmissing-format-attribute
26
-
warning-1 += $(call cc-option, -Wmissing-prototypes)
26
+
warning-1 += -Wmissing-prototypes
27
27
warning-1 += -Wold-style-definition
28
-
warning-1 += $(call cc-option, -Wmissing-include-dirs)
28
+
warning-1 += -Wmissing-include-dirs
29
29
warning-1 += $(call cc-option, -Wunused-but-set-variable)
30
30
warning-1 += $(call cc-option, -Wunused-const-variable)
31
31
warning-1 += $(call cc-option, -Wpacked-not-aligned)
32
32
warning-1 += $(call cc-option, -Wstringop-truncation)
33
-
warning-1 += $(call cc-disable-warning, missing-field-initializers)
34
-
warning-1 += $(call cc-disable-warning, sign-compare)
33
+
# The following turn off the warnings enabled by -Wextra
34
+
warning-1 += -Wno-missing-field-initializers
35
+
warning-1 += -Wno-sign-compare
35
36
36
37
warning-2 := -Waggregate-return
37
38
warning-2 += -Wcast-align
···
40
39
warning-2 += -Wnested-externs
41
40
warning-2 += -Wshadow
42
41
warning-2 += $(call cc-option, -Wlogical-op)
43
-
warning-2 += $(call cc-option, -Wmissing-field-initializers)
44
-
warning-2 += $(call cc-option, -Wsign-compare)
42
+
warning-2 += -Wmissing-field-initializers
43
+
warning-2 += -Wsign-compare
45
44
warning-2 += $(call cc-option, -Wmaybe-uninitialized)
46
45
warning-2 += $(call cc-option, -Wunused-macros)
47
46
···
67
66
else
68
67
69
68
ifdef CONFIG_CC_IS_CLANG
70
-
KBUILD_CFLAGS += $(call cc-disable-warning, initializer-overrides)
71
-
KBUILD_CFLAGS += $(call cc-disable-warning, unused-value)
72
-
KBUILD_CFLAGS += $(call cc-disable-warning, format)
73
-
KBUILD_CFLAGS += $(call cc-disable-warning, sign-compare)
74
-
KBUILD_CFLAGS += $(call cc-disable-warning, format-zero-length)
75
-
KBUILD_CFLAGS += $(call cc-disable-warning, uninitialized)
69
+
KBUILD_CFLAGS += -Wno-initializer-overrides
70
+
KBUILD_CFLAGS += -Wno-unused-value
71
+
KBUILD_CFLAGS += -Wno-format
72
+
KBUILD_CFLAGS += -Wno-sign-compare
73
+
KBUILD_CFLAGS += -Wno-format-zero-length
74
+
KBUILD_CFLAGS += -Wno-uninitialized
76
75
endif
77
76
endif
+5
-7
scripts/Makefile.host
+5
-7
scripts/Makefile.host
···
67
67
_hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
68
68
$(HOSTCXXFLAGS_$(basetarget).o)
69
69
70
-
__hostc_flags = $(_hostc_flags)
71
-
__hostcxx_flags = $(_hostcxx_flags)
72
-
70
+
# $(objtree)/$(obj) for including generated headers from checkin source files
73
71
ifeq ($(KBUILD_EXTMOD),)
74
72
ifneq ($(srctree),.)
75
-
__hostc_flags = -I$(obj) $(call flags,_hostc_flags)
76
-
__hostcxx_flags = -I$(obj) $(call flags,_hostcxx_flags)
73
+
_hostc_flags += -I $(objtree)/$(obj)
74
+
_hostcxx_flags += -I $(objtree)/$(obj)
77
75
endif
78
76
endif
79
77
80
-
hostc_flags = -Wp,-MD,$(depfile) $(__hostc_flags)
81
-
hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags)
78
+
hostc_flags = -Wp,-MD,$(depfile) $(_hostc_flags)
79
+
hostcxx_flags = -Wp,-MD,$(depfile) $(_hostcxx_flags)
82
80
83
81
#####
84
82
# Compile programs on the host
+8
-18
scripts/Makefile.lib
+8
-18
scripts/Makefile.lib
···
137
137
$(CFLAGS_KCOV))
138
138
endif
139
139
140
-
__c_flags = $(_c_flags)
141
-
__a_flags = $(_a_flags)
142
-
__cpp_flags = $(_cpp_flags)
143
-
144
-
# If building the kernel in a separate objtree expand all occurrences
145
-
# of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
140
+
# $(srctree)/$(src) for including checkin headers from generated source files
141
+
# $(objtree)/$(obj) for including generated headers from checkin source files
146
142
ifeq ($(KBUILD_EXTMOD),)
147
143
ifneq ($(srctree),.)
148
-
149
-
# -I$(obj) locates generated .h files
150
-
# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
151
-
# and locates generated .h files
152
-
# FIXME: Replace both with specific CFLAGS* statements in the makefiles
153
-
__c_flags = $(if $(obj),$(call addtree,-I$(src)) -I$(obj)) \
154
-
$(call flags,_c_flags)
155
-
__a_flags = $(call flags,_a_flags)
156
-
__cpp_flags = $(call flags,_cpp_flags)
144
+
_c_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
145
+
_a_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
146
+
_cpp_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)
157
147
endif
158
148
endif
159
149
160
150
c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \
161
151
-include $(srctree)/include/linux/compiler_types.h \
162
-
$(__c_flags) $(modkern_cflags) \
152
+
$(_c_flags) $(modkern_cflags) \
163
153
$(basename_flags) $(modname_flags)
164
154
165
155
a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \
166
-
$(__a_flags) $(modkern_aflags)
156
+
$(_a_flags) $(modkern_aflags)
167
157
168
158
cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \
169
-
$(__cpp_flags)
159
+
$(_cpp_flags)
170
160
171
161
ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F))
172
162
+3
-3
scripts/dtc/Makefile
+3
-3
scripts/dtc/Makefile
···
9
9
dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o
10
10
11
11
# Source files need to get at the userspace version of libfdt_env.h to compile
12
-
HOST_EXTRACFLAGS := -I$(src)/libfdt
12
+
HOST_EXTRACFLAGS := -I $(srctree)/$(src)/libfdt
13
13
14
14
ifeq ($(wildcard /usr/include/yaml.h),)
15
15
ifneq ($(CHECK_DTBS),)
···
23
23
endif
24
24
25
25
# Generated files need one more search path to include headers in source tree
26
-
HOSTCFLAGS_dtc-lexer.lex.o := -I$(src)
27
-
HOSTCFLAGS_dtc-parser.tab.o := -I$(src)
26
+
HOSTCFLAGS_dtc-lexer.lex.o := -I $(srctree)/$(src)
27
+
HOSTCFLAGS_dtc-parser.tab.o := -I $(srctree)/$(src)
28
28
29
29
# dependencies on generated files need to be listed explicitly
30
30
$(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h
+2
-2
scripts/genksyms/Makefile
+2
-2
scripts/genksyms/Makefile
···
31
31
endif
32
32
33
33
# -I needed for generated C source (shipped source)
34
-
HOSTCFLAGS_parse.tab.o := -I$(src)
35
-
HOSTCFLAGS_lex.lex.o := -I$(src)
34
+
HOSTCFLAGS_parse.tab.o := -I $(srctree)/$(src)
35
+
HOSTCFLAGS_lex.lex.o := -I $(srctree)/$(src)
36
36
37
37
# dependencies on generated files need to be listed explicitly
38
38
$(obj)/lex.lex.o: $(obj)/parse.tab.h
+3
-5
scripts/kconfig/Makefile
+3
-5
scripts/kconfig/Makefile
···
76
76
defconfig: $(obj)/conf
77
77
ifeq ($(KBUILD_DEFCONFIG),)
78
78
$< $(silent) --defconfig $(Kconfig)
79
-
else
80
-
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
79
+
else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
81
80
@$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
82
81
$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
83
82
else
84
83
@$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"
85
84
$(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
86
-
endif
87
85
endif
88
86
89
87
%_defconfig: $(obj)/conf
···
145
147
symbol.o
146
148
147
149
$(obj)/lexer.lex.o: $(obj)/parser.tab.h
148
-
HOSTCFLAGS_lexer.lex.o := -I$(src)
149
-
HOSTCFLAGS_parser.tab.o := -I$(src)
150
+
HOSTCFLAGS_lexer.lex.o := -I $(srctree)/$(src)
151
+
HOSTCFLAGS_parser.tab.o := -I $(srctree)/$(src)
150
152
151
153
# conf: Used for defconfig, oldconfig and related targets
152
154
hostprogs-y += conf
+12
-1
scripts/kconfig/confdata.c
+12
-1
scripts/kconfig/confdata.c
···
867
867
const char *str;
868
868
char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1];
869
869
char *env;
870
+
bool need_newline = false;
870
871
871
872
if (!name)
872
873
name = conf_get_configname();
···
913
912
"#\n"
914
913
"# %s\n"
915
914
"#\n", str);
915
+
need_newline = false;
916
916
} else if (!(sym->flags & SYMBOL_CHOICE)) {
917
917
sym_calc_value(sym);
918
918
if (!(sym->flags & SYMBOL_WRITE))
919
919
goto next;
920
+
if (need_newline) {
921
+
fprintf(out, "\n");
922
+
need_newline = false;
923
+
}
920
924
sym->flags &= ~SYMBOL_WRITE;
921
-
922
925
conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);
923
926
}
924
927
···
934
929
if (menu->next)
935
930
menu = menu->next;
936
931
else while ((menu = menu->parent)) {
932
+
if (!menu->sym && menu_is_visible(menu) &&
933
+
menu != &rootmenu) {
934
+
str = menu_get_prompt(menu);
935
+
fprintf(out, "# end of %s\n", str);
936
+
need_newline = true;
937
+
}
937
938
if (menu->next) {
938
939
menu = menu->next;
939
940
break;
+16
scripts/modules-check.sh
+16
scripts/modules-check.sh
···
1
+
#!/bin/sh
2
+
# SPDX-License-Identifier: GPL-2.0
3
+
4
+
set -e
5
+
6
+
# Check uniqueness of module names
7
+
check_same_name_modules()
8
+
{
9
+
for m in $(sed 's:.*/::' modules.order modules.builtin | sort | uniq -d)
10
+
do
11
+
echo "warning: same basename if the following are built as modules:" >&2
12
+
sed "/\/$m/!d;s:^kernel/: :" modules.order modules.builtin >&2
13
+
done
14
+
}
15
+
16
+
check_same_name_modules