Pull Kbuild fixes from Masahiro Yamada: - update Kbuild and Kconfig documents - sanitize -I compiler option handling - update extract-vmlinux script to recognize LZ4 and ZSTD - fix tools Makefiles - update tags.sh to handle __ro_after_init - suppress warnings in case getconf does not recognize LFS_* parameters * tag 'kbuild-fixes-v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: suppress warnings from 'getconf LFS_*' scripts/tags.sh: add __ro_after_init tools: build: Use HOSTLDFLAGS with fixdep tools: build: Fixup host c flags tools build: fix # escaping in .cmd files for future Make scripts: teach extract-vmlinux about LZ4 and ZSTD kbuild: remove duplicated comments about PHONY kbuild: .PHONY is not a variable, but PHONY is kbuild: do not drop -I without parameter kbuild: document the KBUILD_KCONFIG env. variable kconfig: update user kconfig tools doc. kbuild: delete INSTALL_FW_PATH from kbuild documentation kbuild: update ARCH alias info for sparc kbuild: update ARCH alias info for sh
Showing the changes to scripts (9 of 15 files). Show all
Unified · Split
| @@ -214,7 +214,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj · 213 unmodified lines | |||
| 214 | # Prefix -I with $(srctree) if it is not an absolute path. | 214 | # Prefix -I with $(srctree) if it is not an absolute path. |
| 215 | # skip if -I has no parameter | 215 | # skip if -I has no parameter |
| 216 | addtree = $(if $(patsubst -I%,%,$(1)), \ | 216 | addtree = $(if $(patsubst -I%,%,$(1)), \ |
| 217 | $(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1))) | 217 | $(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1)) |
| 218 | 218 | ||
| 219 | # Find all -I options and call addtree | 219 | # Find all -I options and call addtree |
| 220 | flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) | 220 | flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) |
| @@ -590,7 +590,4 @@ endif · 589 unmodified lines | |||
| 590 | # We never want them to be removed automatically. | 590 | # We never want them to be removed automatically. |
| 591 | .SECONDARY: $(targets) | 591 | .SECONDARY: $(targets) |
| 592 | 592 | ||
| 593 | # Declare the contents of the .PHONY variable as phony. We keep that | ||
| 594 | # information in a variable se we can use it in if_changed and friends. | ||
| 595 | |||
| 596 | .PHONY: $(PHONY) | 593 | .PHONY: $(PHONY) |
| @@ -88,7 +88,4 @@ PHONY += $(subdir-ymn) · 87 unmodified lines | |||
| 88 | $(subdir-ymn): | 88 | $(subdir-ymn): |
| 89 | $(Q)$(MAKE) $(clean)=$@ | 89 | $(Q)$(MAKE) $(clean)=$@ |
| 90 | 90 | ||
| 91 | # Declare the contents of the .PHONY variable as phony. We keep that | ||
| 92 | # information in a variable se we can use it in if_changed and friends. | ||
| 93 | |||
| 94 | .PHONY: $(PHONY) | 91 | .PHONY: $(PHONY) |
| @@ -54,8 +54,4 @@ PHONY += $(subdir-ym) · 53 unmodified lines | |||
| 54 | $(subdir-ym): | 54 | $(subdir-ym): |
| 55 | $(Q)$(MAKE) $(modbuiltin)=$@ | 55 | $(Q)$(MAKE) $(modbuiltin)=$@ |
| 56 | 56 | ||
| 57 | |||
| 58 | # Declare the contents of the .PHONY variable as phony. We keep that | ||
| 59 | # information in a variable se we can use it in if_changed and friends. | ||
| 60 | |||
| 61 | .PHONY: $(PHONY) | 57 | .PHONY: $(PHONY) |
| @@ -35,8 +35,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) · 34 unmodified lines | |||
| 35 | $(modules): | 35 | $(modules): |
| 36 | $(call cmd,modules_install,$(MODLIB)/$(modinst_dir)) | 36 | $(call cmd,modules_install,$(MODLIB)/$(modinst_dir)) |
| 37 | 37 | ||
| 38 | |||
| 39 | # Declare the contents of the .PHONY variable as phony. We keep that | ||
| 40 | # information in a variable so we can use it in if_changed and friends. | ||
| 41 | |||
| 42 | .PHONY: $(PHONY) | 38 | .PHONY: $(PHONY) |
| @@ -149,8 +149,4 @@ ifneq ($(cmd_files),) · 148 unmodified lines | |||
| 149 | include $(cmd_files) | 149 | include $(cmd_files) |
| 150 | endif | 150 | endif |
| 151 | 151 | ||
| 152 | |||
| 153 | # Declare the contents of the .PHONY variable as phony. We keep that | ||
| 154 | # information in a variable se we can use it in if_changed and friends. | ||
| 155 | |||
| 156 | .PHONY: $(PHONY) | 152 | .PHONY: $(PHONY) |
| @@ -27,7 +27,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D)) · 26 unmodified lines | |||
| 27 | $(modules): | 27 | $(modules): |
| 28 | $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir)) | 28 | $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir)) |
| 29 | 29 | ||
| 30 | # Declare the contents of the .PHONY variable as phony. We keep that | ||
| 31 | # information in a variable se we can use it in if_changed and friends. | ||
| 32 | |||
| 33 | .PHONY: $(PHONY) | 30 | .PHONY: $(PHONY) |
| @@ -57,6 +57,8 @@ try_decompress '\3757zXZ\000' abcde unxz · 56 unmodified lines | |||
| 57 | try_decompress 'BZh' xy bunzip2 | 57 | try_decompress 'BZh' xy bunzip2 |
| 58 | try_decompress '\135\0\0\0' xxx unlzma | 58 | try_decompress '\135\0\0\0' xxx unlzma |
| 59 | try_decompress '\211\114\132' xy 'lzop -d' | 59 | try_decompress '\211\114\132' xy 'lzop -d' |
| 60 | try_decompress '\002!L\030' xxx 'lz4 -d' | ||
| 61 | try_decompress '(\265/\375' xxx unzstd | ||
| 60 | 62 | ||
| 61 | # Bail out: | 63 | # Bail out: |
| 62 | echo "$me: Cannot find vmlinux." >&2 | 64 | echo "$me: Cannot find vmlinux." >&2 |
| @@ -245,7 +245,7 @@ exuberant() · 244 unmodified lines | |||
| 245 | { | 245 | { |
| 246 | setup_regex exuberant asm c | 246 | setup_regex exuberant asm c |
| 247 | all_target_sources | xargs $1 -a \ | 247 | all_target_sources | xargs $1 -a \ |
| 248 | -I __initdata,__exitdata,__initconst, \ | 248 | -I __initdata,__exitdata,__initconst,__ro_after_init \ |
| 249 | -I __initdata_memblock \ | 249 | -I __initdata_memblock \ |
| 250 | -I __refdata,__attribute,__maybe_unused,__always_unused \ | 250 | -I __refdata,__attribute,__maybe_unused,__always_unused \ |
| 251 | -I __acquires,__releases,__deprecated \ | 251 | -I __acquires,__releases,__deprecated \ |