Commit fb2d99be authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 4b50c8c4

Makefile

+5 −7
Original line number Diff line number Diff line
@@ -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



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)