The patch titled
kbuild: improving option checking
has been added to the -mm tree. Its filename is
kbuild-improving-option-checking.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: kbuild: improving option checking
From: Oleg Verych <olecom@xxxxxxxxxxxxxx>
GNU binutils, root users, tmpfiles, external modules ro builds must be
fixed to do the right thing now.
In "safe" environment new /dev/null replacement may be used as simply as
`echo > null', `gcc -o null'. In aggressive starting with $(null) is
recommended.
Feature: file $(objtree)/null isn't in any "clear" target (yet).
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Oleg Verych <olecom@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
scripts/Kbuild.include | 65 ++++++++++++++++++++++++---------------
1 file changed, 41 insertions(+), 24 deletions(-)
diff -puN scripts/Kbuild.include~kbuild-improving-option-checking scripts/Kbuild.include
--- a/scripts/Kbuild.include~kbuild-improving-option-checking
+++ a/scripts/Kbuild.include
@@ -1,12 +1,15 @@
####
# kbuild: Generic definitions
-# Convinient variables
+# Convinient constants
comma := ,
squote := '
empty :=
space := $(empty) $(empty)
+# Immortal black-hole for mortals and roots
+null = $(shell test -L null || (rm -f null; ln -s /dev/null null); echo null)
+
###
# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
dot-target = $(dir $@).$(notdir $@)
@@ -56,35 +59,45 @@ endef
# gcc support functions
# See documentation in Documentation/kbuild/makefiles.txt
-# output directory for tests below
-TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
-
# as-option
# Usage: cflags-y += $(call as-option, -Wa$(comma)-isa=foo,)
-
-as-option = $(shell if $(CC) $(CFLAGS) $(1) -Wa,-Z -c -o /dev/null \
- -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; \
- else echo "$(2)"; fi ;)
+define as-option
+ $(shell
+ if $(CC) $(CFLAGS) $(1) -c -o $(null) -xassembler null >null 2>&1; \
+ then echo $(1); \
+ else echo $(2); \
+ fi)
+endef
# as-instr
# Usage: cflags-y += $(call as-instr, instr, option1, option2)
-
-as-instr = $(shell if echo -e "$(1)" | \
- $(CC) $(AFLAGS) -c -xassembler - \
- -o $(TMPOUT)astest$$$$.out > /dev/null 2>&1; \
- then rm $(TMPOUT)astest$$$$.out; echo "$(2)"; \
- else echo "$(3)"; fi)
+define as-instr
+ $(shell \
+ if printf "$(1)" | $(AS) >$(null) 2>&1 -W -o null; \
+ then echo "$(2)"; \
+ else echo "$(3)"; \
+ fi)
+endef
# cc-option
# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
-
-cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
- > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+define cc-option
+ $(shell \
+ if $(CC) $(CFLAGS) $(1) -S -o $(null) -xc null >null 2>&1; \
+ then echo "$(1)"; \
+ else echo "$(2)"; \
+ fi)
+endef
# cc-option-yn
# Usage: flag := $(call cc-option-yn, -march=winchip-c6)
-cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
- > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
+define cc-option-yn
+ $(shell \
+ if $(CC) $(CFLAGS) $(1) -S -o $(null) -xc null >null 2>&1; \
+ then echo "y"; \
+ else echo "n"; \
+ fi)
+endef
# cc-option-align
# Prefix align with either -falign or -malign
@@ -102,10 +115,13 @@ cc-ifversion = $(shell if [ $(call cc-ve
# ld-option
# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
-ld-option = $(shell if $(CC) $(1) -nostdlib -xc /dev/null \
- -o $(TMPOUT)ldtest$$$$.out > /dev/null 2>&1; \
- then rm $(TMPOUT)ldtest$$$$.out; echo "$(1)"; \
- else echo "$(2)"; fi)
+define ld-option
+ $(shell \
+ if $(CC) $(1) -nostdlib -o $(null) -xc null >null 2>&1; \
+ then echo "$(1)"; \
+ else echo "$(2)"; \
+ fi)
+endef
###
# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
@@ -115,6 +131,7 @@ build := -f $(if $(KBUILD_SRC),$(srctree
# Prefix -I with $(srctree) if it is not an absolute path
addtree = $(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)))
@@ -125,7 +142,7 @@ cmd = @$(echo-cmd) $(cmd_$(1))
objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
###
-# if_changed - execute command if any prerequisite is newer than
+# if_changed - execute command if any prerequisite is newer than
# target, or command line has changed
# if_changed_dep - as if_changed, but uses fixdep to reveal dependencies
# including used config symbols
_
Patches currently in -mm which might be from olecom@xxxxxxxxxxxxxx are
kbuild-improving-option-checking.patch
deprecate-smbfs-in-favour-of-cifs-docs.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
