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.
Showing the changes to scripts (1 of 1 file). Show all
Unified · Split
| @@ -57,7 +57,7 @@ endef · 56 unmodified lines | |||
| 57 | # See documentation in Documentation/kbuild/makefiles.txt | 57 | # See documentation in Documentation/kbuild/makefiles.txt |
| 58 | 58 | ||
| 59 | # checker-shell | 59 | # checker-shell |
| 60 | # Usage: option = $(call checker-shell, $(CC)...-o $$OUT, option-ok, otherwise) | 60 | # Usage: option = $(call checker-shell,$(CC)...-o $$OUT,option-ok,otherwise) |
| 61 | # Exit code chooses option. $$OUT is safe location for needless output. | 61 | # Exit code chooses option. $$OUT is safe location for needless output. |
| 62 | define checker-shell | 62 | define checker-shell |
| 63 | $(shell set -e; \ | 63 | $(shell set -e; \ |
| @@ -74,23 +74,23 @@ define checker-shell · 10 unmodified lines | |||
| 74 | endef | 74 | endef |
| 75 | 75 | ||
| 76 | # as-option | 76 | # as-option |
| 77 | # Usage: cflags-y += $(call as-option, -Wa$(comma)-isa=foo,) | 77 | # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,) |
| 78 | as-option = $(call checker-shell, \ | 78 | as-option = $(call checker-shell,\ |
| 79 | $(CC) $(CFLAGS) $(1) -c -xassembler /dev/null -o $$OUT, $(1), $(2)) | 79 | $(CC) $(CFLAGS) $(1) -c -xassembler /dev/null -o $$OUT,$(1),$(2)) |
| 80 | 80 | ||
| 81 | # as-instr | 81 | # as-instr |
| 82 | # Usage: cflags-y += $(call as-instr, instr, option1, option2) | 82 | # Usage: cflags-y += $(call as-instr,instr,option1,option2) |
| 83 | as-instr = $(call checker-shell, \ | 83 | as-instr = $(call checker-shell,\ |
| 84 | printf "$(1)" | $(CC) $(AFLAGS) -c -xassembler -o $$OUT -, $(2), $(3)) | 84 | printf "$(1)" | $(CC) $(AFLAGS) -c -xassembler -o $$OUT -,$(2),$(3)) |
| 85 | 85 | ||
| 86 | # cc-option | 86 | # cc-option |
| 87 | # Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586) | 87 | # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586) |
| 88 | cc-option = $(call checker-shell, \ | 88 | cc-option = $(call checker-shell,\ |
| 89 | $(CC) $(CFLAGS) $(if $(3),$(3),$(1)) -S -xc /dev/null -o $$OUT, $(1), $(2)) | 89 | $(CC) $(CFLAGS) $(if $(3),$(3),$(1)) -S -xc /dev/null -o $$OUT,$(1),$(2)) |
| 90 | 90 | ||
| 91 | # cc-option-yn | 91 | # cc-option-yn |
| 92 | # Usage: flag := $(call cc-option-yn, -march=winchip-c6) | 92 | # Usage: flag := $(call cc-option-yn,-march=winchip-c6) |
| 93 | cc-option-yn = $(call cc-option, "y", "n", $(1)) | 93 | cc-option-yn = $(call cc-option,"y","n",$(1)) |
| 94 | 94 | ||
| 95 | # cc-option-align | 95 | # cc-option-align |
| 96 | # Prefix align with either -falign or -malign | 96 | # Prefix align with either -falign or -malign |
| @@ -98,7 +98,7 @@ cc-option-align = $(subst -functions=0,,\ · 1 unmodified line | |||
| 98 | $(call cc-option,-falign-functions=0,-malign-functions=0)) | 98 | $(call cc-option,-falign-functions=0,-malign-functions=0)) |
| 99 | 99 | ||
| 100 | # cc-version | 100 | # cc-version |
| 101 | # Usage gcc-ver := $(call cc-version, $(CC)) | 101 | # Usage gcc-ver := $(call cc-version,$(CC)) |
| 102 | cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) | 102 | cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) |
| 103 | 103 | ||
| 104 | # cc-ifversion | 104 | # cc-ifversion |
| @@ -107,8 +107,8 @@ cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3)) · 2 unmodified lines | |||
| 107 | 107 | ||
| 108 | # ld-option | 108 | # ld-option |
| 109 | # Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both) | 109 | # Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both) |
| 110 | ld-option = $(call checker-shell, \ | 110 | ld-option = $(call checker-shell,\ |
| 111 | $(CC) $(1) -nostdlib -xc /dev/null -o $$OUT, $(1), $(2)) | 111 | $(CC) $(1) -nostdlib -xc /dev/null -o $$OUT,$(1),$(2)) |
| 112 | 112 | ||
| 113 | ###### | 113 | ###### |
| 114 | 114 | ||
| @@ -120,22 +120,22 @@ build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj · 5 unmodified lines | |||
| 120 | # Prefix -I with $(srctree) if it is not an absolute path, | 120 | # Prefix -I with $(srctree) if it is not an absolute path, |
| 121 | # add original to the end | 121 | # add original to the end |
| 122 | addtree = $(if \ | 122 | addtree = $(if \ |
| 123 | $(filter-out -I/%, $(1)), $(patsubst -I%,-I$(srctree)/%,$(1))) $(1) | 123 | $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1) |
| 124 | 124 | ||
| 125 | # Find all -I options and call addtree | 125 | # Find all -I options and call addtree |
| 126 | flags = $(foreach o,$($(1)), \ | 126 | flags = $(foreach o,$($(1)),\ |
| 127 | $(if $(filter -I%,$(o)), $(call addtree, $(o)), $(o))) | 127 | $(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) |
| 128 | 128 | ||
| 129 | # echo command. | 129 | # echo command. |
| 130 | # Short version is used, if $(quiet) equals `quiet_', otherwise full one. | 130 | # Short version is used, if $(quiet) equals `quiet_', otherwise full one. |
| 131 | echo-cmd = $(if $($(quiet)cmd_$(1)), \ | 131 | echo-cmd = $(if $($(quiet)cmd_$(1)),\ |
| 132 | echo ' $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';) | 132 | echo ' $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';) |
| 133 | 133 | ||
| 134 | # printing commands | 134 | # printing commands |
| 135 | cmd = @$(echo-cmd) $(cmd_$(1)) | 135 | cmd = @$(echo-cmd) $(cmd_$(1)) |
| 136 | 136 | ||
| 137 | # Add $(obj)/ for paths that are not absolute | 137 | # Add $(obj)/ for paths that are not absolute |
| 138 | objectify = $(foreach o,$(1), $(if $(filter /%,$(o)), $(o), $(obj)/$(o))) | 138 | objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o))) |
| 139 | 139 | ||
| 140 | ### | 140 | ### |
| 141 | # if_changed - execute command if any prerequisite is newer than | 141 | # if_changed - execute command if any prerequisite is newer than |