mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	[PATCH] kbuild, Kbuild.include: avoid using spaces in call arguments
Do not use whitespace in arguments of functions in makefiles, as they propagate further without notice. Thus we get + echo ' y' instead of + echo y Fix misleading comments. Signed-off-by: Oleg Verych <olecom@flower.upol.cz> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									5331be0905
								
							
						
					
					
						commit
						bff288c19e
					
				
					 1 changed files with 20 additions and 20 deletions
				
			
		| 
						 | 
					@ -57,7 +57,7 @@ endef
 | 
				
			||||||
# See documentation in Documentation/kbuild/makefiles.txt
 | 
					# See documentation in Documentation/kbuild/makefiles.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# checker-shell
 | 
					# checker-shell
 | 
				
			||||||
# Usage: option = $(call checker-shell, $(CC)...-o $$OUT, option-ok, otherwise)
 | 
					# Usage: option = $(call checker-shell,$(CC)...-o $$OUT,option-ok,otherwise)
 | 
				
			||||||
# Exit code chooses option. $$OUT is safe location for needless output.
 | 
					# Exit code chooses option. $$OUT is safe location for needless output.
 | 
				
			||||||
define checker-shell
 | 
					define checker-shell
 | 
				
			||||||
  $(shell set -e; \
 | 
					  $(shell set -e; \
 | 
				
			||||||
| 
						 | 
					@ -74,23 +74,23 @@ define checker-shell
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# as-option
 | 
					# as-option
 | 
				
			||||||
# Usage: cflags-y += $(call as-option, -Wa$(comma)-isa=foo,)
 | 
					# Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
 | 
				
			||||||
as-option = $(call checker-shell, \
 | 
					as-option = $(call checker-shell,\
 | 
				
			||||||
   $(CC) $(CFLAGS) $(1) -c -xassembler /dev/null -o $$OUT, $(1), $(2))
 | 
					   $(CC) $(CFLAGS) $(1) -c -xassembler /dev/null -o $$OUT,$(1),$(2))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# as-instr
 | 
					# as-instr
 | 
				
			||||||
# Usage: cflags-y += $(call as-instr, instr, option1, option2)
 | 
					# Usage: cflags-y += $(call as-instr,instr,option1,option2)
 | 
				
			||||||
as-instr = $(call checker-shell, \
 | 
					as-instr = $(call checker-shell,\
 | 
				
			||||||
   printf "$(1)" | $(CC) $(AFLAGS) -c -xassembler -o $$OUT -, $(2), $(3))
 | 
					   printf "$(1)" | $(CC) $(AFLAGS) -c -xassembler -o $$OUT -,$(2),$(3))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# cc-option
 | 
					# cc-option
 | 
				
			||||||
# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
 | 
					# Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
 | 
				
			||||||
cc-option = $(call checker-shell, \
 | 
					cc-option = $(call checker-shell,\
 | 
				
			||||||
   $(CC) $(CFLAGS) $(if $(3),$(3),$(1)) -S -xc /dev/null -o $$OUT, $(1), $(2))
 | 
					   $(CC) $(CFLAGS) $(if $(3),$(3),$(1)) -S -xc /dev/null -o $$OUT,$(1),$(2))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# cc-option-yn
 | 
					# cc-option-yn
 | 
				
			||||||
# Usage: flag := $(call cc-option-yn, -march=winchip-c6)
 | 
					# Usage: flag := $(call cc-option-yn,-march=winchip-c6)
 | 
				
			||||||
cc-option-yn = $(call cc-option, "y", "n", $(1))
 | 
					cc-option-yn = $(call cc-option,"y","n",$(1))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# cc-option-align
 | 
					# cc-option-align
 | 
				
			||||||
# Prefix align with either -falign or -malign
 | 
					# Prefix align with either -falign or -malign
 | 
				
			||||||
| 
						 | 
					@ -98,7 +98,7 @@ cc-option-align = $(subst -functions=0,,\
 | 
				
			||||||
   $(call cc-option,-falign-functions=0,-malign-functions=0))
 | 
					   $(call cc-option,-falign-functions=0,-malign-functions=0))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# cc-version
 | 
					# cc-version
 | 
				
			||||||
# Usage gcc-ver := $(call cc-version, $(CC))
 | 
					# Usage gcc-ver := $(call cc-version,$(CC))
 | 
				
			||||||
cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
 | 
					cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# cc-ifversion
 | 
					# cc-ifversion
 | 
				
			||||||
| 
						 | 
					@ -107,8 +107,8 @@ cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# ld-option
 | 
					# ld-option
 | 
				
			||||||
# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
 | 
					# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
 | 
				
			||||||
ld-option = $(call checker-shell, \
 | 
					ld-option = $(call checker-shell,\
 | 
				
			||||||
   $(CC) $(1) -nostdlib -xc /dev/null -o $$OUT, $(1), $(2))
 | 
					   $(CC) $(1) -nostdlib -xc /dev/null -o $$OUT,$(1),$(2))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
######
 | 
					######
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -120,22 +120,22 @@ build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
 | 
				
			||||||
# Prefix -I with $(srctree) if it is not an absolute path,
 | 
					# Prefix -I with $(srctree) if it is not an absolute path,
 | 
				
			||||||
# add original to the end
 | 
					# add original to the end
 | 
				
			||||||
addtree = $(if \
 | 
					addtree = $(if \
 | 
				
			||||||
	$(filter-out -I/%, $(1)), $(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
 | 
						$(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Find all -I options and call addtree
 | 
					# Find all -I options and call addtree
 | 
				
			||||||
flags = $(foreach o,$($(1)), \
 | 
					flags = $(foreach o,$($(1)),\
 | 
				
			||||||
	$(if $(filter -I%,$(o)), $(call addtree, $(o)), $(o)))
 | 
						$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# echo command.
 | 
					# echo command.
 | 
				
			||||||
# Short version is used, if $(quiet) equals `quiet_', otherwise full one.
 | 
					# Short version is used, if $(quiet) equals `quiet_', otherwise full one.
 | 
				
			||||||
echo-cmd = $(if $($(quiet)cmd_$(1)), \
 | 
					echo-cmd = $(if $($(quiet)cmd_$(1)),\
 | 
				
			||||||
	echo '  $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';)
 | 
						echo '  $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# printing commands
 | 
					# printing commands
 | 
				
			||||||
cmd = @$(echo-cmd) $(cmd_$(1))
 | 
					cmd = @$(echo-cmd) $(cmd_$(1))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Add $(obj)/ for paths that are not absolute
 | 
					# Add $(obj)/ for paths that are not absolute
 | 
				
			||||||
objectify = $(foreach o,$(1), $(if $(filter /%,$(o)), $(o), $(obj)/$(o)))
 | 
					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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue