diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-05-31 19:11:39 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-06-01 21:50:44 +0900 |
| commit | fb2d99be8919d63ff5c48f33bff4847387c6742b (patch) | |
| tree | 9f4b7924b55eb08e914b37ec10eafc9e1ee17a4c | |
| parent | 4b50c8c4eaf06a825d1c005c0b1b4a8307087b83 (diff) | |
| download | lwn-fb2d99be8919d63ff5c48f33bff4847387c6742b.tar.gz lwn-fb2d99be8919d63ff5c48f33bff4847387c6742b.zip | |
kbuild: merge two 'ifdef CONFIG_TRIM_UNUSED_KSYMS' blocks
This hunk has two 'ifdef CONFIG_TRIM_UNUSED_KSYMS ... endif' blocks
with no other code interleaved. Merge them.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
| -rw-r--r-- | Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -1098,16 +1098,14 @@ vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) # Recurse until adjust_autoksyms.sh is satisfied PHONY += autoksyms_recursive ifdef CONFIG_TRIM_UNUSED_KSYMS -autoksyms_recursive: descend modules.order - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \ - "$(MAKE) -f $(srctree)/Makefile vmlinux" -endif - # For the kernel to actually contain only the needed exported symbols, # we have to build modules as well to determine what those symbols are. # (this can be evaluated only once include/config/auto.conf has been included) -ifdef CONFIG_TRIM_UNUSED_KSYMS - KBUILD_MODULES := 1 +KBUILD_MODULES := 1 + +autoksyms_recursive: descend modules.order + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \ + "$(MAKE) -f $(srctree)/Makefile vmlinux" endif autoksyms_h := $(if $(CONFIG_TRIM_UNUSED_KSYMS), include/generated/autoksyms.h) |