Skip to content

Commit 68b4fe3

Browse files
jpoimboenathanchance
authored andcommitted
kbuild: Add objtool to top-level clean target
Objtool is an integral part of the build, make sure it gets cleaned by "make clean" and "make mrproper". Fixes: 442f04c ("objtool: Add tool to perform compile-time stack metadata validation") Reported-by: Jens Remus <jremus@linux.ibm.com> Closes: https://lore.kernel.org/15f2af3b-be33-46fc-b972-6b8e7e0aa52e@linux.ibm.com Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Tested-by: Jens Remus <jremus@linux.ibm.com> Link: https://patch.msgid.link/968faf2ed30fa8b3519f79f01a1ecfe7929553e5.1770759919.git.jpoimboe@kernel.org [nathan: use Closes: instead of Link: per checkpatch.pl] Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent df989b0 commit 68b4fe3

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1481,6 +1481,15 @@ ifneq ($(wildcard $(resolve_btfids_O)),)
14811481
$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean
14821482
endif
14831483

1484+
PHONY += objtool_clean
1485+
1486+
objtool_O = $(abspath $(objtree))/tools/objtool
1487+
1488+
objtool_clean:
1489+
ifneq ($(wildcard $(objtool_O)),)
1490+
$(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) clean
1491+
endif
1492+
14841493
tools/: FORCE
14851494
$(Q)mkdir -p $(objtree)/tools
14861495
$(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
@@ -1644,7 +1653,7 @@ vmlinuxclean:
16441653
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
16451654
$(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
16461655

1647-
clean: archclean vmlinuxclean resolve_btfids_clean
1656+
clean: archclean vmlinuxclean resolve_btfids_clean objtool_clean
16481657

16491658
# mrproper - Delete all generated files, including .config
16501659
#

tools/objtool/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ srctree := $(patsubst %/,%,$(dir $(CURDIR)))
2929
srctree := $(patsubst %/,%,$(dir $(srctree)))
3030
endif
3131

32+
RM ?= rm -f
33+
3234
LIBSUBCMD_DIR = $(srctree)/tools/lib/subcmd/
3335
ifneq ($(OUTPUT),)
3436
LIBSUBCMD_OUTPUT = $(abspath $(OUTPUT))/libsubcmd

0 commit comments

Comments
 (0)