Skip to content
/ linux Public

Commit 42c7b5d

Browse files
jpoimboeSasha Levin
authored andcommitted
kbuild: Add objtool to top-level clean target
[ Upstream commit 68b4fe3 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 5c32bfb commit 42c7b5d

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

Makefile

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

1373+
PHONY += objtool_clean
1374+
1375+
objtool_O = $(abspath $(objtree))/tools/objtool
1376+
1377+
objtool_clean:
1378+
ifneq ($(wildcard $(objtool_O)),)
1379+
$(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) clean
1380+
endif
1381+
13731382
tools/: FORCE
13741383
$(Q)mkdir -p $(objtree)/tools
13751384
$(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
@@ -1527,7 +1536,7 @@ vmlinuxclean:
15271536
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
15281537
$(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
15291538

1530-
clean: archclean vmlinuxclean resolve_btfids_clean
1539+
clean: archclean vmlinuxclean resolve_btfids_clean objtool_clean
15311540

15321541
# mrproper - Delete all generated files, including .config
15331542
#

tools/objtool/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ srctree := $(patsubst %/,%,$(dir $(CURDIR)))
77
srctree := $(patsubst %/,%,$(dir $(srctree)))
88
endif
99

10+
RM ?= rm -f
11+
1012
LIBSUBCMD_DIR = $(srctree)/tools/lib/subcmd/
1113
ifneq ($(OUTPUT),)
1214
LIBSUBCMD_OUTPUT = $(abspath $(OUTPUT))/libsubcmd

0 commit comments

Comments
 (0)