aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Verych <olecom@flower.upol.cz>2007-02-05 20:18:21 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-06 17:30:49 -0500
commit5de043f4bd11a9e0a3e8daec7d1905da575a76b7 (patch)
tree1cdafacd6a0f6e12bd5b88d9031a6130169ca868
parentf6112ec27a8f0eee6c5a996f65c7bfd9457d9f85 (diff)
[PATCH] kbuild: improve option checking, Kbuild.include cleanup
GNU binutils, root users, tmpfiles, external modules ro builds must be fixed to do the right thing now. Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Horst Schirmeier <horst@schirmeier.com> Cc: Jan Beulich <jbeulich@novell.com> Cc: Daniel Drake <dsd@gentoo.org> Cc: Andi Kleen <ak@suse.de> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Oleg Verych <olecom@flower.upol.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--scripts/Kbuild.include96
1 files changed, 53 insertions, 43 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index f01f8c072852..96926eb13b0a 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -1,7 +1,7 @@
1#### 1####
2# kbuild: Generic definitions 2# kbuild: Generic definitions
3 3
4# Convinient variables 4# Convenient constants
5comma := , 5comma := ,
6squote := ' 6squote := '
7empty := 7empty :=
@@ -56,40 +56,46 @@ endef
56# gcc support functions 56# gcc support functions
57# See documentation in Documentation/kbuild/makefiles.txt 57# See documentation in Documentation/kbuild/makefiles.txt
58 58
59# output directory for tests below 59# checker-shell
60TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/) 60# Usage: option = $(call checker-shell, $(CC)...-o $$OUT, option-ok, otherwise)
61# Exit code chooses option. $$OUT is safe location for needless output.
62define checker-shell
63 $(shell set -e; \
64 DIR=$(KBUILD_EXTMOD); \
65 cd $${DIR:-$(objtree)}; \
66 OUT=$$PWD/.$$$$.null; \
67 \
68 ln -s /dev/null $$OUT; \
69 if $(1) >/dev/null 2>&1; \
70 then echo "$(2)"; \
71 else echo "$(3)"; \
72 fi; \
73 rm -f $$OUT)
74endef
61 75
62# as-option 76# as-option
63# Usage: cflags-y += $(call as-option, -Wa$(comma)-isa=foo,) 77# Usage: cflags-y += $(call as-option, -Wa$(comma)-isa=foo,)
64 78as-option = $(call checker-shell, \
65as-option = $(shell if $(CC) $(CFLAGS) $(1) -Wa,-Z -c -o /dev/null \ 79 $(CC) $(CFLAGS) $(1) -c -xassembler /dev/null -o $$OUT, $(1), $(2))
66 -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; \
67 else echo "$(2)"; fi ;)
68 80
69# as-instr 81# as-instr
70# Usage: cflags-y += $(call as-instr, instr, option1, option2) 82# Usage: cflags-y += $(call as-instr, instr, option1, option2)
71 83as-instr = $(call checker-shell, \
72as-instr = $(shell if echo -e "$(1)" | \ 84 printf "$(1)" | $(CC) $(AFLAGS) -c -xassembler -o $$OUT -, $(2), $(3))
73 $(CC) $(AFLAGS) -c -xassembler - \
74 -o $(TMPOUT)astest$$$$.out > /dev/null 2>&1; \
75 then rm $(TMPOUT)astest$$$$.out; echo "$(2)"; \
76 else echo "$(3)"; fi)
77 85
78# cc-option 86# cc-option
79# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586) 87# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
80 88cc-option = $(call checker-shell, \
81cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ 89 $(CC) $(CFLAGS) $(if $(3),$(3),$(1)) -S -xc /dev/null -o $$OUT, $(1), $(2))
82 > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
83 90
84# cc-option-yn 91# cc-option-yn
85# Usage: flag := $(call cc-option-yn, -march=winchip-c6) 92# Usage: flag := $(call cc-option-yn, -march=winchip-c6)
86cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ 93cc-option-yn = $(call cc-option, "y", "n", $(1))
87 > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
88 94
89# cc-option-align 95# cc-option-align
90# Prefix align with either -falign or -malign 96# Prefix align with either -falign or -malign
91cc-option-align = $(subst -functions=0,,\ 97cc-option-align = $(subst -functions=0,,\
92 $(call cc-option,-falign-functions=0,-malign-functions=0)) 98 $(call cc-option,-falign-functions=0,-malign-functions=0))
93 99
94# cc-version 100# cc-version
95# Usage gcc-ver := $(call cc-version, $(CC)) 101# Usage gcc-ver := $(call cc-version, $(CC))
@@ -97,35 +103,42 @@ cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
97 103
98# cc-ifversion 104# cc-ifversion
99# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) 105# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
100cc-ifversion = $(shell if [ $(call cc-version, $(CC)) $(1) $(2) ]; then \ 106cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
101 echo $(3); fi;)
102 107
103# ld-option 108# ld-option
104# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both) 109# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
105ld-option = $(shell if $(CC) $(1) -nostdlib -xc /dev/null \ 110ld-option = $(call checker-shell, \
106 -o $(TMPOUT)ldtest$$$$.out > /dev/null 2>&1; \ 111 $(CC) $(1) -nostdlib -xc /dev/null -o $$OUT, $(1), $(2))
107 then rm $(TMPOUT)ldtest$$$$.out; echo "$(1)"; \ 112
108 else echo "$(2)"; fi) 113######
109 114
110###
111# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj= 115# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
112# Usage: 116# Usage:
113# $(Q)$(MAKE) $(build)=dir 117# $(Q)$(MAKE) $(build)=dir
114build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj 118build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
115 119
116# Prefix -I with $(srctree) if it is not an absolute path 120# Prefix -I with $(srctree) if it is not an absolute path,
117addtree = $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1) 121# add original to the end
122addtree = $(if \
123 $(filter-out -I/%, $(1)), $(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
124
118# Find all -I options and call addtree 125# Find all -I options and call addtree
119flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) 126flags = $(foreach o,$($(1)), \
127 $(if $(filter -I%,$(o)), $(call addtree, $(o)), $(o)))
120 128
121# If quiet is set, only print short version of command 129# echo command.
130# Short version is used, if $(quiet) equals `quiet_', otherwise full one.
131echo-cmd = $(if $($(quiet)cmd_$(1)), \
132 echo ' $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';)
133
134# printing commands
122cmd = @$(echo-cmd) $(cmd_$(1)) 135cmd = @$(echo-cmd) $(cmd_$(1))
123 136
124# Add $(obj)/ for paths that is not absolute 137# Add $(obj)/ for paths that are not absolute
125objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o))) 138objectify = $(foreach o,$(1), $(if $(filter /%,$(o)), $(o), $(obj)/$(o)))
126 139
127### 140###
128# if_changed - execute command if any prerequisite is newer than 141# if_changed - execute command if any prerequisite is newer than
129# target, or command line has changed 142# target, or command line has changed
130# if_changed_dep - as if_changed, but uses fixdep to reveal dependencies 143# if_changed_dep - as if_changed, but uses fixdep to reveal dependencies
131# including used config symbols 144# including used config symbols
@@ -133,16 +146,12 @@ objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
133# See Documentation/kbuild/makefiles.txt for more info 146# See Documentation/kbuild/makefiles.txt for more info
134 147
135ifneq ($(KBUILD_NOCMDDEP),1) 148ifneq ($(KBUILD_NOCMDDEP),1)
136# Check if both arguments has same arguments. Result in empty string if equal 149# Check if both arguments has same arguments. Result is empty string, if equal.
137# User may override this check using make KBUILD_NOCMDDEP=1 150# User may override this check using make KBUILD_NOCMDDEP=1
138arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ 151arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \
139 $(filter-out $(cmd_$@), $(cmd_$(1))) ) 152 $(filter-out $(cmd_$@), $(cmd_$(1))) )
140endif 153endif
141 154
142# echo command. Short version is $(quiet) equals quiet, otherwise full command
143echo-cmd = $(if $($(quiet)cmd_$(1)), \
144 echo ' $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';)
145
146# >'< substitution is for echo to work, 155# >'< substitution is for echo to work,
147# >$< substitution to preserve $ when reloading .cmd file 156# >$< substitution to preserve $ when reloading .cmd file
148# note: when using inline perl scripts [perl -e '...$$t=1;...'] 157# note: when using inline perl scripts [perl -e '...$$t=1;...']
@@ -153,15 +162,15 @@ make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1)))))
153# PHONY targets skipped in both cases. 162# PHONY targets skipped in both cases.
154any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^) 163any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)
155 164
156# Execute command if command has changed or prerequisitei(s) are updated 165# Execute command if command has changed or prerequisite(s) are updated.
157# 166#
158if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ 167if_changed = $(if $(strip $(any-prereq) $(arg-check)), \
159 @set -e; \ 168 @set -e; \
160 $(echo-cmd) $(cmd_$(1)); \ 169 $(echo-cmd) $(cmd_$(1)); \
161 echo 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd) 170 echo 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd)
162 171
163# execute the command and also postprocess generated .d dependencies 172# Execute the command and also postprocess generated .d dependencies file.
164# file 173#
165if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \ 174if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \
166 @set -e; \ 175 @set -e; \
167 $(echo-cmd) $(cmd_$(1)); \ 176 $(echo-cmd) $(cmd_$(1)); \
@@ -169,9 +178,10 @@ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \
169 rm -f $(depfile); \ 178 rm -f $(depfile); \
170 mv -f $(dot-target).tmp $(dot-target).cmd) 179 mv -f $(dot-target).tmp $(dot-target).cmd)
171 180
181# Will check if $(cmd_foo) changed, or any of the prerequisites changed,
182# and if so will execute $(rule_foo).
172# Usage: $(call if_changed_rule,foo) 183# Usage: $(call if_changed_rule,foo)
173# will check if $(cmd_foo) changed, or any of the prequisites changed, 184#
174# and if so will execute $(rule_foo)
175if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ), \ 185if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ), \
176 @set -e; \ 186 @set -e; \
177 $(rule_$(1))) 187 $(rule_$(1)))