* [PATCH v2 01/11] Kbuild: don't add ../../ to include path
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 02/11] Kbuild: avoid duplicate " Arnd Bergmann
` (9 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
When we build with O=objdir and objdir is directly below the source tree,
$(srctree) becomes '..'.
When a Makefile adds a CFLAGS option like -Ipath/to/headers and
we are building with a separate object directory, Kbuild tries to
add two -I options, one for the source tree and one for the object
tree. An absolute path is treated as a special case, and don't add
this one twice. This also normally catches -I$(srctree)/$(src)
as $(srctree) usually is an absolute directory like /home/arnd/linux/.
The combination of the two behaviors however results in an invalid
path name to be included: we get both ../$(src) and ../../$(src),
the latter one pointing outside of the source tree, usually to a
nonexisting directory. Building with 'make W=1' makes this obvious:
cc1: error: ../../arch/arm/mach-s3c24xx/include: No such file or directory [-Werror=missing-include-dirs]
This adds another special case, treating path names starting with ../
like those starting with / so we don't try to prefix that with
$(srctree).
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
scripts/Kbuild.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 0f82314621f2..f8b45eb47ed3 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -202,7 +202,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
# Prefix -I with $(srctree) if it is not an absolute path.
# skip if -I has no parameter
addtree = $(if $(patsubst -I%,%,$(1)), \
-$(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1))
+$(if $(filter-out -I/% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1))
# Find all -I options and call addtree
flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 02/11] Kbuild: avoid duplicate include path
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 01/11] Kbuild: don't add ../../ to include path Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE Arnd Bergmann
` (8 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
arch/$(hdr-arch)/include/generated/uapi is included twice in the
header search path, which is unnecessary, so this changes the
top-level Makefile to drop the second instance by filtering out
everything from USERINCLUDE that was already part of LINUXINCLUDE.
This should have very little effect other than making the 'make V=1'
output slightly smaller and making the build time faster by a miniscule
amount, but it seems to be cleaner.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 8b80a1506be0..45159861e645 100644
--- a/Makefile
+++ b/Makefile
@@ -389,8 +389,9 @@ LINUXINCLUDE := \
-Iarch/$(hdr-arch)/include/generated/uapi \
-Iarch/$(hdr-arch)/include/generated \
$(if $(KBUILD_SRC), -I$(srctree)/include) \
- -Iinclude \
- $(USERINCLUDE)
+ -Iinclude
+
+LINUXINCLUDE += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
KBUILD_CPPFLAGS := -D__KERNEL__
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 01/11] Kbuild: don't add ../../ to include path Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 02/11] Kbuild: avoid duplicate " Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 04/11] Kbuild: arch: look for generated headers in obtree Arnd Bergmann
` (7 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
When $(LINUXINCLUDE) is added to the cflags of a target that
normall doesn't have it (e.g. HOSTCFLAGS), each entry in the
list is expanded so that we search both $(objtree) and $(srctree),
which is a bit silly, as we already know which of the two we
want for each entry in LINUXINCLUDE.
Also, a follow-up patch changes the behavior so we only look in
$(srctree) for manually added include path, and that breaks finding
the generated headers.
This adds an explicit $(objtree) for each tree that we want to
look for generated files.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 45159861e645..969924783543 100644
--- a/Makefile
+++ b/Makefile
@@ -377,19 +377,19 @@ CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,)
# Use USERINCLUDE when you must reference the UAPI directories only.
USERINCLUDE := \
-I$(srctree)/arch/$(hdr-arch)/include/uapi \
- -Iarch/$(hdr-arch)/include/generated/uapi \
+ -I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
-I$(srctree)/include/uapi \
- -Iinclude/generated/uapi \
+ -I$(objtree)/include/generated/uapi \
-include $(srctree)/include/linux/kconfig.h
# Use LINUXINCLUDE when you must reference the include/ directory.
# Needed to be compatible with the O= option
LINUXINCLUDE := \
-I$(srctree)/arch/$(hdr-arch)/include \
- -Iarch/$(hdr-arch)/include/generated/uapi \
- -Iarch/$(hdr-arch)/include/generated \
+ -I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
+ -I$(objtree)/arch/$(hdr-arch)/include/generated \
$(if $(KBUILD_SRC), -I$(srctree)/include) \
- -Iinclude
+ -I$(objtree)/include
LINUXINCLUDE += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 04/11] Kbuild: arch: look for generated headers in obtree
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (2 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes Arnd Bergmann
` (6 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
There are very few files that need add an -I$(obj) gcc for the preprocessor
or the assembler. For C files, we add always these for both the objtree and
srctree, but for the other ones we require the Makefile to add them, and
Kbuild then adds it for both trees.
As a preparation for changing the meaning of the -I$(obj) directive to
only refer to the srctree, this changes the two instances in arch/x86 to use
an explictit $(objtree) prefix where needed, otherwise we won't find the
headers any more, as reported by the kbuild 0day builder.
arch/x86/realmode/rm/realmode.lds.S:75:20: fatal error: pasyms.h: No such file or directory
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/boot/Makefile | 2 +-
arch/powerpc/boot/Makefile | 2 +-
arch/powerpc/kvm/Makefile | 2 +-
arch/s390/boot/compressed/Makefile | 4 ++--
arch/um/Makefile | 4 ++--
arch/x86/boot/Makefile | 2 +-
arch/x86/realmode/rm/Makefile | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/alpha/boot/Makefile b/arch/alpha/boot/Makefile
index 8399bd0e68e8..0cbe4c59d3ce 100644
--- a/arch/alpha/boot/Makefile
+++ b/arch/alpha/boot/Makefile
@@ -15,7 +15,7 @@ targets := vmlinux.gz vmlinux \
OBJSTRIP := $(obj)/tools/objstrip
HOSTCFLAGS := -Wall -I$(objtree)/usr/include
-BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
+BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj)
# SRM bootable image. Copy to offset 512 of a partition.
$(obj)/bootimage: $(addprefix $(obj)/tools/,mkbb lxboot bootlx) $(obj)/vmlinux.nh
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 8fe78a3efc92..ad3782610cf1 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -43,7 +43,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y)
BOOTCFLAGS += -fno-stack-protector
endif
-BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
+BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj)
DTC_FLAGS ?= -p 1024
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index eba0bea6e032..1f9e5529e692 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -20,7 +20,7 @@ common-objs-y += powerpc.o emulate.o emulate_loadstore.o
obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o
obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o
-AFLAGS_booke_interrupts.o := -I$(obj)
+AFLAGS_booke_interrupts.o := -I$(objtree)/$(obj)
kvm-e500-objs := \
$(common-objs-y) \
diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile
index 1dd210347e12..2657a29a2026 100644
--- a/arch/s390/boot/compressed/Makefile
+++ b/arch/s390/boot/compressed/Makefile
@@ -31,10 +31,10 @@ quiet_cmd_sizes = GEN $@
$(obj)/sizes.h: vmlinux
$(call if_changed,sizes)
-AFLAGS_head.o += -I$(obj)
+AFLAGS_head.o += -I$(objtree)/$(obj)
$(obj)/head.o: $(obj)/sizes.h
-CFLAGS_misc.o += -I$(obj)
+CFLAGS_misc.o += -I$(objtree)/$(obj)
$(obj)/misc.o: $(obj)/sizes.h
OBJCOPYFLAGS_vmlinux.bin := -R .comment -S
diff --git a/arch/um/Makefile b/arch/um/Makefile
index e3abe6f3156d..0ca46ededfc7 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -78,8 +78,8 @@ include $(ARCH_DIR)/Makefile-os-$(OS)
KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
-I$(srctree)/$(HOST_DIR)/include/uapi \
- -I$(HOST_DIR)/include/generated \
- -I$(HOST_DIR)/include/generated/uapi
+ -I$(objtree)/$(HOST_DIR)/include/generated \
+ -I$(objtree)/$(HOST_DIR)/include/generated/uapi
# -Derrno=kernel_errno - This turns all kernel references to errno into
# kernel_errno to separate them from the libc errno. This allows -fno-common
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index be8e688fa0d4..12ea8f8384f4 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -96,7 +96,7 @@ $(obj)/zoffset.h: $(obj)/compressed/vmlinux FORCE
$(call if_changed,zoffset)
-AFLAGS_header.o += -I$(obj)
+AFLAGS_header.o += -I$(objtree)/$(obj)
$(obj)/header.o: $(obj)/zoffset.h
LDFLAGS_setup.elf := -T
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index c556c5ae8de5..25012abc3409 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -48,7 +48,7 @@ targets += realmode.lds
$(obj)/realmode.lds: $(obj)/pasyms.h
LDFLAGS_realmode.elf := --emit-relocs -T
-CPPFLAGS_realmode.lds += -P -C -I$(obj)
+CPPFLAGS_realmode.lds += -P -C -I$(objtree)/$(obj)
targets += realmode.elf
$(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (3 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 04/11] Kbuild: arch: look for generated headers in obtree Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-07-18 20:14 ` Michal Marek
2016-06-15 15:45 ` [PATCH v2 06/11] ARM: don't include removed directories Arnd Bergmann
` (5 subsequent siblings)
10 siblings, 1 reply; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
When building with separate object directories and driver specific
Makefiles that add additional header include paths, Kbuild adjusts
the gcc flags so that we include both the directory in the source
tree and in the object tree.
However, due to another bug I fixed earlier, this did not actually
include the correct directory in the object tree, so we know that
we only really need the source tree here. Also, including the
object tree sometimes causes warnings about nonexisting directories
when the include path only exists in the source.
This changes the logic to only emit the -I argument for the srctree,
not for objects. We still need both $(srctree)/$(src) and $(obj)
though, so I'm adding them manually.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
scripts/Kbuild.include | 2 +-
scripts/Makefile.lib | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index f8b45eb47ed3..15b196fc2f49 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -202,7 +202,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
# Prefix -I with $(srctree) if it is not an absolute path.
# skip if -I has no parameter
addtree = $(if $(patsubst -I%,%,$(1)), \
-$(if $(filter-out -I/% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1))
+$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))
# Find all -I options and call addtree
flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 76494e15417b..0a07f9014944 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -155,9 +155,10 @@ else
# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
# and locates generated .h files
# FIXME: Replace both with specific CFLAGS* statements in the makefiles
-__c_flags = $(call addtree,-I$(obj)) $(call flags,_c_flags)
-__a_flags = $(call flags,_a_flags)
-__cpp_flags = $(call flags,_cpp_flags)
+__c_flags = $(if $(obj),-I$(srctree)/$(src) -I$(obj)) \
+ $(call flags,_c_flags)
+__a_flags = $(call flags,_a_flags)
+__cpp_flags = $(call flags,_cpp_flags)
endif
c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes
2016-06-15 15:45 ` [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes Arnd Bergmann
@ 2016-07-18 20:14 ` Michal Marek
2016-07-19 8:31 ` Arnd Bergmann
0 siblings, 1 reply; 18+ messages in thread
From: Michal Marek @ 2016-07-18 20:14 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel
On Wed, Jun 15, 2016 at 05:45:47PM +0200, Arnd Bergmann wrote:
> When building with separate object directories and driver specific
> Makefiles that add additional header include paths, Kbuild adjusts
> the gcc flags so that we include both the directory in the source
> tree and in the object tree.
>
> However, due to another bug I fixed earlier, this did not actually
> include the correct directory in the object tree, so we know that
> we only really need the source tree here. Also, including the
> object tree sometimes causes warnings about nonexisting directories
> when the include path only exists in the source.
>
> This changes the logic to only emit the -I argument for the srctree,
> not for objects. We still need both $(srctree)/$(src) and $(obj)
> though, so I'm adding them manually.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Hi Arnd,
I applied the series up to this patch to kbuild.git#kbuild. The rest
seem to be related but not dependent patches, so I'll leave it up to the
respective maintainers to pick them up. Is that OK with you?
Thanks,
Michal
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes
2016-07-18 20:14 ` Michal Marek
@ 2016-07-19 8:31 ` Arnd Bergmann
2016-07-19 14:33 ` Kalle Valo
0 siblings, 1 reply; 18+ messages in thread
From: Arnd Bergmann @ 2016-07-19 8:31 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Michal Marek, netdev, dri-devel, linux-kernel, linux-kbuild, akpm
On Monday, July 18, 2016 10:14:39 PM CEST Michal Marek wrote:
> On Wed, Jun 15, 2016 at 05:45:47PM +0200, Arnd Bergmann wrote:
> > When building with separate object directories and driver specific
> > Makefiles that add additional header include paths, Kbuild adjusts
> > the gcc flags so that we include both the directory in the source
> > tree and in the object tree.
> >
> > However, due to another bug I fixed earlier, this did not actually
> > include the correct directory in the object tree, so we know that
> > we only really need the source tree here. Also, including the
> > object tree sometimes causes warnings about nonexisting directories
> > when the include path only exists in the source.
> >
> > This changes the logic to only emit the -I argument for the srctree,
> > not for objects. We still need both $(srctree)/$(src) and $(obj)
> > though, so I'm adding them manually.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Hi Arnd,
>
> I applied the series up to this patch to kbuild.git#kbuild. The rest
> seem to be related but not dependent patches, so I'll leave it up to the
> respective maintainers to pick them up. Is that OK with you?
I think that's fine, a couple were already picked up, and what I have
left now is
a281bfa5713a [SUBMITTED 20160615] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default
83934921e68e [SUBMITTED 20160615] rtlwifi: don't add include path for rtl8188ee
5664e7bb88a8 [SUBMITTED 20160615] drm: amd: remove broken include path
e6d3cf76f9f8 [SUBMITTED 20160615] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M
b21947dbd792 [SUBMITTED 20160615] ARM: don't include removed directories
I can probably put the last two into arm-soc directly. After that, we'd
be left with a very small diff for the series:
diff --git a/Makefile b/Makefile
index caa33e007a8c..53074dbe8619 100644
--- a/Makefile
+++ b/Makefile
@@ -754,6 +754,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
+# warn about incorrect -I include paths
+KBUILD_CFLAGS += -Wmissing-include-dirs
+
# warn about C99 declaration after statement
KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
diff --git a/drivers/gpu/drm/amd/acp/Makefile b/drivers/gpu/drm/amd/acp/Makefile
index 8363cb57915b..8a08e81ee90d 100644
--- a/drivers/gpu/drm/amd/acp/Makefile
+++ b/drivers/gpu/drm/amd/acp/Makefile
@@ -3,6 +3,4 @@
# of AMDSOC/AMDGPU drm driver.
# It provides the HW control for ACP related functionalities.
-subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include
-
AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
index a85419a37651..676e7de27f27 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
@@ -12,4 +12,4 @@ rtl8188ee-objs := \
obj-$(CONFIG_RTL8188EE) += rtl8188ee.o
-ccflags-y += -Idrivers/net/wireless/rtlwifi -D__CHECK_ENDIAN__
+ccflags-y += -D__CHECK_ENDIAN__
I have only tested this on arm, arm64 and x86, so I don't know if that
introduces new warnings, but we could ask Andrew if he wants to add that
to linux-mm after the merge window.
Arnd
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes
2016-07-19 8:31 ` Arnd Bergmann
@ 2016-07-19 14:33 ` Kalle Valo
2016-07-19 15:38 ` Arnd Bergmann
0 siblings, 1 reply; 18+ messages in thread
From: Kalle Valo @ 2016-07-19 14:33 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Michal Marek, netdev, dri-devel, linux-kernel,
linux-kbuild, akpm, linux-wireless
Arnd Bergmann <arnd@arndb.de> writes:
> On Monday, July 18, 2016 10:14:39 PM CEST Michal Marek wrote:
>> On Wed, Jun 15, 2016 at 05:45:47PM +0200, Arnd Bergmann wrote:
>> > When building with separate object directories and driver specific
>> > Makefiles that add additional header include paths, Kbuild adjusts
>> > the gcc flags so that we include both the directory in the source
>> > tree and in the object tree.
>> >
>> > However, due to another bug I fixed earlier, this did not actually
>> > include the correct directory in the object tree, so we know that
>> > we only really need the source tree here. Also, including the
>> > object tree sometimes causes warnings about nonexisting directories
>> > when the include path only exists in the source.
>> >
>> > This changes the logic to only emit the -I argument for the srctree,
>> > not for objects. We still need both $(srctree)/$(src) and $(obj)
>> > though, so I'm adding them manually.
>> >
>> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>>
>> Hi Arnd,
>>
>> I applied the series up to this patch to kbuild.git#kbuild. The rest
>> seem to be related but not dependent patches, so I'll leave it up to the
>> respective maintainers to pick them up. Is that OK with you?
>
> I think that's fine, a couple were already picked up, and what I have
> left now is
>
> a281bfa5713a [SUBMITTED 20160615] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default
> 83934921e68e [SUBMITTED 20160615] rtlwifi: don't add include path for rtl8188ee
Apparently[1] you didn't CC linux-wireless and that's why I didn't see
the rtlwifi patch in wireless patchwork. Care to resend?
[1] https://patchwork.kernel.org/patch/9178861/
--
Kalle Valo
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes
2016-07-19 14:33 ` Kalle Valo
@ 2016-07-19 15:38 ` Arnd Bergmann
2016-07-19 18:07 ` Kalle Valo
0 siblings, 1 reply; 18+ messages in thread
From: Arnd Bergmann @ 2016-07-19 15:38 UTC (permalink / raw)
To: Kalle Valo, Greg Kroah-Hartman
Cc: linux-arm-kernel, Michal Marek, netdev, dri-devel, linux-kernel,
linux-kbuild, akpm, linux-wireless
On Tuesday, July 19, 2016 5:33:44 PM CEST Kalle Valo wrote:
> Arnd Bergmann <arnd@arndb.de> writes:
>
> > On Monday, July 18, 2016 10:14:39 PM CEST Michal Marek wrote:
> >> On Wed, Jun 15, 2016 at 05:45:47PM +0200, Arnd Bergmann wrote:
> >> > When building with separate object directories and driver specific
> >> > Makefiles that add additional header include paths, Kbuild adjusts
> >> > the gcc flags so that we include both the directory in the source
> >> > tree and in the object tree.
> >> >
> >> > However, due to another bug I fixed earlier, this did not actually
> >> > include the correct directory in the object tree, so we know that
> >> > we only really need the source tree here. Also, including the
> >> > object tree sometimes causes warnings about nonexisting directories
> >> > when the include path only exists in the source.
> >> >
> >> > This changes the logic to only emit the -I argument for the srctree,
> >> > not for objects. We still need both $(srctree)/$(src) and $(obj)
> >> > though, so I'm adding them manually.
> >> >
> >> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >>
> >> Hi Arnd,
> >>
> >> I applied the series up to this patch to kbuild.git#kbuild. The rest
> >> seem to be related but not dependent patches, so I'll leave it up to the
> >> respective maintainers to pick them up. Is that OK with you?
> >
> > I think that's fine, a couple were already picked up, and what I have
> > left now is
> >
> > a281bfa5713a [SUBMITTED 20160615] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default
> > 83934921e68e [SUBMITTED 20160615] rtlwifi: don't add include path for rtl8188ee
>
> Apparently[1] you didn't CC linux-wireless and that's why I didn't see
> the rtlwifi patch in wireless patchwork. Care to resend?
>
> [1] https://patchwork.kernel.org/patch/9178861/
>
Done. I've also thrown in two patches for drivers/staging/rtl8*/ that I submitted
a while ago, but I'm not sure if they should get merged through the staging
tree or the wireless tree. I had previously submitted those two as a combined
patch along with a third one that turned out to be unnecessary.
Arnd
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes
2016-07-19 15:38 ` Arnd Bergmann
@ 2016-07-19 18:07 ` Kalle Valo
0 siblings, 0 replies; 18+ messages in thread
From: Kalle Valo @ 2016-07-19 18:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Greg Kroah-Hartman, linux-arm-kernel, Michal Marek, netdev,
dri-devel, linux-kernel, linux-kbuild, akpm, linux-wireless
Arnd Bergmann <arnd@arndb.de> writes:
>> > I think that's fine, a couple were already picked up, and what I have
>> > left now is
>> >
>> > a281bfa5713a [SUBMITTED 20160615] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default
>> > 83934921e68e [SUBMITTED 20160615] rtlwifi: don't add include path for rtl8188ee
>>
>> Apparently[1] you didn't CC linux-wireless and that's why I didn't see
>> the rtlwifi patch in wireless patchwork. Care to resend?
>>
>> [1] https://patchwork.kernel.org/patch/9178861/
>>
>
> Done.
Thanks.
> I've also thrown in two patches for drivers/staging/rtl8*/ that I
> submitted a while ago, but I'm not sure if they should get merged
> through the staging tree or the wireless tree. I had previously
> submitted those two as a combined patch along with a third one that
> turned out to be unnecessary.
Greg applies drivers/staging patches to his staging tree, but I'll take
the rtlwifi patch.
--
Kalle Valo
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 06/11] ARM: don't include removed directories
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (4 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 07/11] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M Arnd Bergmann
` (4 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
Three platforms used to have header files in include/mach that
are now all gone, but the removed directories are still being
included, which leads to -Wmissing-include-dirs warnings.
This removes the extra -I flags.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-mvebu/Makefile | 3 +--
arch/arm/mach-realview/Makefile | 3 +--
arch/arm/mach-s5pv210/Makefile | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index ecf9e0c3b107..568863e1513c 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -1,5 +1,4 @@
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
- -I$(srctree)/arch/arm/plat-orion/include
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
AFLAGS_coherency_ll.o := -Wa,-march=armv7-a
CFLAGS_pmsu.o := -march=armv7-a
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index dae8d86ef4cc..404882130956 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -1,8 +1,7 @@
#
# Makefile for the linux kernel.
#
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
- -I$(srctree)/arch/arm/plat-versatile/include
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-versatile/include
obj-y := core.o
obj-$(CONFIG_REALVIEW_DT) += realview-dt.o
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 72b9e9671507..fa7fb716e388 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -5,7 +5,7 @@
#
# Licensed under GPLv2
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/arch/arm/plat-samsung/include
# Core
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 07/11] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (5 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 06/11] ARM: don't include removed directories Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 08/11] drm: amd: remove broken include path Arnd Bergmann
` (3 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
The machine specific header files are exported for traditional
platforms, but not for the ones that use ARCH_MULTIPLATFORM, as
they could conflict with one another.
In case of ARM_SINGLE_ARMV7M, we end up also exporting them,
but that appears to be a mistake, and we should treat it the
same way as ARCH_MULTIPLATFORM here.
'make W=1' warns about this because it passes -Wmissing-includes
to gcc and the directories are not actually present.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 510620186ee8..3982c7e2fe55 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -266,12 +266,14 @@ machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))
ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
+ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y)
ifeq ($(KBUILD_SRC),)
KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))
else
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
endif
endif
+endif
export TEXT_OFFSET GZFLAGS MMUEXT
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 08/11] drm: amd: remove broken include path
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (6 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 07/11] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 09/11] net: skfb: remove obsolete -I cflag Arnd Bergmann
` (2 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
The AMD ACP driver adds "-I../acp -I../acp/include" to the gcc command
line, which makes no sense, since these are evaluated relative to the
build directory. When we build with "make W=1", they instead cause
a warning:
cc1: error: ../acp/: No such file or directory [-Werror=missing-include-dirs]
cc1: error: ../acp/include: No such file or directory [-Werror=missing-include-dirs]
cc1: all warnings being treated as errors
../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o' failed
../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.o' failed
../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.o' failed
This removes the subdir-ccflags variable that evidently did not
serve any purpose here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/amd/acp/Makefile | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/acp/Makefile b/drivers/gpu/drm/amd/acp/Makefile
index 8363cb57915b..8a08e81ee90d 100644
--- a/drivers/gpu/drm/amd/acp/Makefile
+++ b/drivers/gpu/drm/amd/acp/Makefile
@@ -3,6 +3,4 @@
# of AMDSOC/AMDGPU drm driver.
# It provides the HW control for ACP related functionalities.
-subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include
-
AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 09/11] net: skfb: remove obsolete -I cflag
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (7 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 08/11] drm: amd: remove broken include path Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-16 5:06 ` David Miller
2016-06-15 15:45 ` [PATCH v2 10/11] rtlwifi: don't add include path for rtl8188ee Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 11/11] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default Arnd Bergmann
10 siblings, 1 reply; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
The skfp driver has been moved to drivers/net/fddi/skfp a long time
ago, but we still attempt to include headers from the old location,
which causes a warning when building with W=1:
cc1: error: /git/arm-soc/drivers/net/skfp: No such file or directory [-Werror=missing-include-dirs]
cc1: error: drivers/net/skfp: No such file or directory [-Werror=missing-include-dirs]
Clearly this include directive is not needed any more, so we can
just remove it now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/fddi/skfp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/fddi/skfp/Makefile b/drivers/net/fddi/skfp/Makefile
index b0be0234abf6..a957a1c7e5ba 100644
--- a/drivers/net/fddi/skfp/Makefile
+++ b/drivers/net/fddi/skfp/Makefile
@@ -17,4 +17,4 @@ skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \
# projects. To keep the source common for all those drivers (and
# thus simplify fixes to it), please do not clean it up!
-ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
+ccflags-y := -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 09/11] net: skfb: remove obsolete -I cflag
2016-06-15 15:45 ` [PATCH v2 09/11] net: skfb: remove obsolete -I cflag Arnd Bergmann
@ 2016-06-16 5:06 ` David Miller
0 siblings, 0 replies; 18+ messages in thread
From: David Miller @ 2016-06-16 5:06 UTC (permalink / raw)
To: arnd
Cc: mmarek, linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 15 Jun 2016 17:45:51 +0200
> The skfp driver has been moved to drivers/net/fddi/skfp a long time
> ago, but we still attempt to include headers from the old location,
> which causes a warning when building with W=1:
>
> cc1: error: /git/arm-soc/drivers/net/skfp: No such file or directory [-Werror=missing-include-dirs]
> cc1: error: drivers/net/skfp: No such file or directory [-Werror=missing-include-dirs]
>
> Clearly this include directive is not needed any more, so we can
> just remove it now.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied.
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 10/11] rtlwifi: don't add include path for rtl8188ee
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (8 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 09/11] net: skfb: remove obsolete -I cflag Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
2016-06-15 15:45 ` [PATCH v2 11/11] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default Arnd Bergmann
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
For rtl8188ee, we pass -Idrivers/net/wireless/rtlwifi/ to gcc,
however that directy no longer exists, so evidently this option
is no longer required here and can be removed to avoid a warning
when building with 'make W=1' or 'gcc -Wmissing-include-dirs'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
index a85419a37651..676e7de27f27 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
@@ -12,4 +12,4 @@ rtl8188ee-objs := \
obj-$(CONFIG_RTL8188EE) += rtl8188ee.o
-ccflags-y += -Idrivers/net/wireless/rtlwifi -D__CHECK_ENDIAN__
+ccflags-y += -D__CHECK_ENDIAN__
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 11/11] [EXPERIMENTAL] Kbuild: enable -Wmissing-include-dirs by default
2016-06-15 15:45 [PATCH v2 00/11] Kbuild: fix -Wmissing-include-path warnings Arnd Bergmann
` (9 preceding siblings ...)
2016-06-15 15:45 ` [PATCH v2 10/11] rtlwifi: don't add include path for rtl8188ee Arnd Bergmann
@ 2016-06-15 15:45 ` Arnd Bergmann
10 siblings, 0 replies; 18+ messages in thread
From: Arnd Bergmann @ 2016-06-15 15:45 UTC (permalink / raw)
To: Michal Marek
Cc: linux-kbuild, linux-kernel, linux-arm-kernel, netdev, dri-devel,
Arnd Bergmann
I have fixed up all -Wmissing-include-dirs on ARM randconfig builds,
so we could make this the default, but I have not tested this at all
on other architectures.
This enables it anyway, just to see what other warnings we get
when the build bot analyses the branch.
Don't apply (yet).
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Makefile b/Makefile
index 969924783543..2305cbd61e60 100644
--- a/Makefile
+++ b/Makefile
@@ -781,6 +781,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
+# warn about incorrect -I include paths
+KBUILD_CFLAGS += -Wmissing-include-dirs
+
# warn about C99 declaration after statement
KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
--
2.9.0
^ permalink raw reply related [flat|nested] 18+ messages in thread