Commit 318df9f0 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-tools-build-improvements' 



Jakub Kicinski says:

====================
As promised this series addresses nits and minor issues in tools/bpf
build infra.  One GCC-7 warning which is nice to get rid of.  Dependencies
when built with OUTPUT are fixed.  make clean will now remove the
FEATURE-DUMP.* files.  PHONY target is also updated to match reality.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 68de5ef4 cc5b3403

tools/bpf/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ clean: bpftool_clean 
	$(call QUIET_CLEAN, bpf-progs)

	$(Q)rm -rf $(OUTPUT)*.o $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg \

	       $(OUTPUT)bpf_asm $(OUTPUT)bpf_exp.yacc.* $(OUTPUT)bpf_exp.lex.*

	$(call QUIET_CLEAN, core-gen)

	$(Q)rm -f $(OUTPUT)FEATURE-DUMP.bpf



install: $(PROGS) bpftool_install

	$(call QUIET_INSTALL, bpf_jit_disasm)
@@ -100,4 +102,4 @@ bpftool_install: 
bpftool_clean:

	$(call descend,bpftool,clean)



.PHONY: bpftool FORCE
 
.PHONY: all install clean bpftool bpftool_install bpftool_clean

tools/bpf/bpftool/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ ifeq ($(feature-disassembler-four-args), 1) 
CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE

endif



include $(wildcard *.d)

include $(wildcard $(OUTPUT)*.d)



all: $(OUTPUT)bpftool
@@ -89,6 +89,8 @@ $(OUTPUT)%.o: %.c 
clean: $(LIBBPF)-clean

	$(call QUIET_CLEAN, bpftool)

	$(Q)$(RM) $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d

	$(call QUIET_CLEAN, core-gen)

	$(Q)$(RM) $(OUTPUT)FEATURE-DUMP.bpftool



install: $(OUTPUT)bpftool

	$(call QUIET_INSTALL, bpftool)

tools/bpf/bpftool/xlated_dumper.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct dump_data { 
	unsigned long address_call_base;

	struct kernel_sym *sym_mapping;

	__u32 sym_count;

	char scratch_buff[SYM_MAX_NAME];

	char scratch_buff[SYM_MAX_NAME + 8];

};



void kernel_syms_load(struct dump_data *dd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE