Skip to contentSkip to conversation

kbuild: remove duplicate -I flag in addtree

PATCH In review matt mooney 3 participants 4 messages Sep 27, 2010 – Oct 5, 2010

Subsystems (2)
Kbuild Kernel janitors
lore
Share & tools
lore

matt mooney

author
#0 lore raw

PATCH 1/1 kbuild: remove duplicate -I flag in addtree

When O= is used, any -I flag given that is not an absolute path gets duplicated. The $(1) appended to the conditional clause covers the absolute case, but due to being outside of the conditional statement it gets added everytime.

Signed-off-by matt mooney <[email protected]>
---
 scripts/Kbuild.include |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/Kbuild.include +1 -1
index ed2773e..08c74ed 100644
@@ -158,7 +158,7 @@ modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin 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/%,$(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)))
Signature · 1 line
1.7.2.1
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · matt mooney

When O= is used, any -I flag given that is not an absolute path gets duplicated. The $(1) appended to the conditional clause covers the absolute case, but due to being outside of the conditional statement it gets added everytime.

Signed-off-by matt mooney <[email protected]>
Acked-by WANG Cong <[email protected]>
Quoted 9 lines

---
scripts/Kbuild.include | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
scripts/Kbuild.include +0 -0
index ed2773e..08c74ed 100644

scripts/Kbuild.include modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj · line 164

Quoted 8 lines
scripts/Kbuild.include +1 -1
@@ -158,7 +158,7 @@ modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin 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/%,$(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)))

The original code also missed a comma, this patch fixes it.

Thanks!

#2 lore raw
In reply to matt mooney
Quoted 15 lines · matt mooney

When O= is used, any -I flag given that is not an absolute path gets duplicated. The $(1) appended to the conditional clause covers the absolute case, but due to being outside of the conditional statement it gets added everytime.

Signed-off-by matt mooney <[email protected]>
---
 scripts/Kbuild.include |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/Kbuild.include +0 -0
index ed2773e..08c74ed 100644

scripts/Kbuild.include modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj · line 161

Quoted 5 lines
scripts/Kbuild.include +1 -1
@@ -158,7 +158,7 @@ modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin 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/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))

$ mkdir _build-new; make O=_build-new defconfig; make O=_build-new V=1 all
fails with

perl /home/mmarek/linux-2.6/kernel/timeconst.pl 1000 > kernel/timeconst.h
gcc -Wp,-MD,kernel/.time.o.d -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.5/include -I/home/mmarek/linux-2.6/arch/x86/include -Iinclude -I/home/mmarek/linux-2.6/include -include include/generated/autoconf.h -I/home/mmarek/linux-2.6/kernel -D__KERNEL__ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -Os -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -funit-at-a-time -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -DCONFIG_AS_CFI_SECTIONS=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -Wframe-larger-than 48 -fno-stack-protector -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(time)" -D"KBUILD_MODNAME=KBUILD_STR(time)" -c -o kernel/time.o /home/mmarek/linux-2.6/kernel/time.c
/home/mmarek/linux-2.6/kernel/time.c:44:23: fatal error: timeconst.h: No such file or directory

The correct gcc line without your patch is
gcc -Wp,-MD,kernel/.time.o.d -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.5/include -I/home/mmarek/linux-2.6/arch/x86/include -Iinclude -I/home/mmarek/linux-2.6/include -include include/generated/autoconf.h -I/home/mmarek/linux-2.6/kernel -Ikernel -D__KERNEL__ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -Os -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -funit-at-a-time -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -DCONFIG_AS_CFI_SECTIONS=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -Wframe-larger-than 48 -fno-stack-protector -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(time)" -D"KBUILD_MODNAME=KBUILD_STR(time)" -c -o kernel/time.o /home/mmarek/linux-2.6/kernel/time.c

The difference is that with your patch it is lacking the -Ikernel include, so it does not search for generated header files in $(obj).

Michal

author
#3 lore raw
Quoted 30 lines · Michal Marek
Quoted 15 lines · matt mooney

When O= is used, any -I flag given that is not an absolute path gets duplicated. The $(1) appended to the conditional clause covers the absolute case, but due to being outside of the conditional statement it gets added everytime.

Signed-off-by matt mooney <[email protected]>
---
 scripts/Kbuild.include |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/Kbuild.include +0 -0
index ed2773e..08c74ed 100644

scripts/Kbuild.include modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj · line 161

Quoted 5 lines
scripts/Kbuild.include +1 -1
@@ -158,7 +158,7 @@ modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin 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/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))

$ mkdir _build-new; make O=_build-new defconfig; make O=_build-new V=1 all
fails with

perl /home/mmarek/linux-2.6/kernel/timeconst.pl 1000 > kernel/timeconst.h
gcc -Wp,-MD,kernel/.time.o.d -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.5/include -I/home/mmarek/linux-2.6/arch/x86/include -Iinclude -I/home/mmarek/linux-2.6/include -include include/generated/autoconf.h -I/home/mmarek/linux-2.6/kernel -D__KERNEL__ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -Os -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -funit-at-a-time -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -DCONFIG_AS_CFI_SECTIONS=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -Wframe-larger-than 48 -fno-stack-protector -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(time)" -D"KBUILD_MODNAME=KBUILD_STR(time)" -c -o kernel/time.o /home/mmarek
/linux-2.6/kernel/time.c
/home/mmarek/linux-2.6/kernel/time.c:44:23: fatal error: timeconst.h: No such file or directory

Quoted 6 lines

The correct gcc line without your patch is
gcc -Wp,-MD,kernel/.time.o.d -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.5/include -I/home/mmarek/linux-2.6/arch/x86/include -Iinclude -I/home/mmarek/linux-2.6/include -include include/generated/autoconf.h -I/home/mmarek/linux-2.6/kernel -Ikernel -D__KERNEL__ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -Os -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -funit-at-a-time -maccumulate-outgoing-args -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 -DCONFIG_AS_CFI_SECTIONS=1 -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -Wframe-larger-than 48 -fno-stack-protector -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(time)" -D"KBUILD_MODNAME=KBUILD_STR(time)" -c -o kernel/time.o /ho
me/mmarek/linux-2.6/kernel/time.c

The difference is that with your patch it is lacking the -Ikernel include, so it does not search for generated header files in $(obj).

Ugh! I tested it for an external module and I built every driver under media/ thinking this covered all cases. I completely forgot about generated files.

Thanks,
mfm