Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beda9f3a authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] kbuild: more Makefile cleanups 



This adds the remaining changes which should have been part of the
review process.

 - the define command is inappropriate (it's primarily for rule
   definitions)
 - execute commands in the current dir as all other commands
 - .*.tmp (but not .*.null) files are also removed up by "make clean"
 - printf has other side effects, just use "echo -e"
 - proper quoting
 - proper indentation

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2fd592e4

scripts/Kbuild.include

+36 −36
Original line number Diff line number Diff line 
####

# kbuild: Generic definitions



# Convenient constants

# Convenient variables

comma   := ,

squote  := '

empty   :=
@@ -56,39 +56,43 @@ endef 
# gcc support functions

# See documentation in Documentation/kbuild/makefiles.txt



# checker-shell

# Usage: option = $(call checker-shell,$(CC)...-o $$OUT,option-ok,otherwise)

# Exit code chooses option. $$OUT is safe location for needless output.

define checker-shell

$(shell set -e; \

  DIR=$(KBUILD_EXTMOD); \

  cd $${DIR:-$(objtree)}; \

  OUT=$$PWD/.$$$$.null; \

  if $(1) >/dev/null 2>&1; \

# output directory for tests below

TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)



# try-run

# Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise)

# Exit code chooses option. "$$TMP" is can be used as temporary file and

# is automatically cleaned up.

try-run = $(shell set -e;		\

	TMP="$(TMPOUT).$$$$.tmp";	\

	if ($(1)) >/dev/null 2>&1;	\

	then echo "$(2)";		\

	else echo "$(3)";		\

	fi;				\

  rm -f $$OUT)

endef

	rm -f "$$TMP")



# as-option

# Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)

as-option = $(call checker-shell,\

   $(CC) $(CFLAGS) $(1) -c -xassembler /dev/null -o $$OUT,$(1),$(2))



as-option = $(call try-run,\

	$(CC) $(CFLAGS) $(1) -c -xassembler /dev/null -o "$$TMP",$(1),$(2))



# as-instr

# Usage: cflags-y += $(call as-instr,instr,option1,option2)

as-instr = $(call checker-shell,\

   printf "$(1)" | $(CC) $(AFLAGS) -c -xassembler -o $$OUT -,$(2),$(3))



as-instr = $(call try-run,\

	echo -e "$(1)" | $(CC) $(AFLAGS) -c -xassembler -o "$$TMP" -,$(2),$(3))



# cc-option

# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)

cc-option = $(call checker-shell,\

   $(CC) $(CFLAGS) $(if $(3),$(3),$(1)) -S -xc /dev/null -o $$OUT,$(1),$(2))



cc-option = $(call try-run,\

	$(CC) $(CFLAGS) $(1) -S -xc /dev/null -o "$$TMP",$(1),$(2))



# cc-option-yn

# Usage: flag := $(call cc-option-yn,-march=winchip-c6)

cc-option-yn = $(call cc-option,"y","n",$(1))

cc-option-yn = $(call try-run,\

	$(CC) $(CFLAGS) $(1) -S -xc /dev/null -o "$$TMP",y,n)



# cc-option-align

# Prefix align with either -falign or -malign
@@ -105,24 +109,22 @@ cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3)) 


# ld-option

# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)

ld-option = $(call checker-shell,\

   $(CC) $(1) -nostdlib -xc /dev/null -o $$OUT,$(1),$(2))

ld-option = $(call try-run,\

	$(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))



######



###

# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=

# Usage:

# $(Q)$(MAKE) $(build)=dir

build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj



# Prefix -I with $(srctree) if it is not an absolute path,

# add original to the end

addtree = $(if \

	$(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)

# 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)))

flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))



# echo command.

# Short version is used, if $(quiet) equals `quiet_', otherwise full one.
@@ -144,7 +146,7 @@ objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o))) 
# See Documentation/kbuild/makefiles.txt for more info



ifneq ($(KBUILD_NOCMDDEP),1)

# Check if both arguments has same arguments. Result is empty string, if equal.

# Check if both arguments has same arguments. Result is empty string if equal.

# User may override this check using make KBUILD_NOCMDDEP=1

arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \

                    $(filter-out $(cmd_$@),   $(cmd_$(1))) )
@@ -168,7 +170,6 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ 
	echo 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd)



# Execute the command and also postprocess generated .d dependencies file.

#

if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ),                  \

	@set -e;                                                             \

	$(echo-cmd) $(cmd_$(1));                                             \
@@ -176,10 +177,9 @@ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \ 
	rm -f $(depfile);                                                    \

	mv -f $(dot-target).tmp $(dot-target).cmd)



# Will check if $(cmd_foo) changed, or any of the prerequisites changed,

# and if so will execute $(rule_foo).

# Usage: $(call if_changed_rule,foo)

#

# Will check if $(cmd_foo) or any of the prerequisites changed,

# and if so will execute $(rule_foo).

if_changed_rule = $(if $(strip $(any-prereq) $(arg-check) ),                 \

	@set -e;                                                             \

	$(rule_$(1)))