diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2018-03-16 09:25:00 +0100 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-03-16 09:25:11 +0100 |
| commit | 318df9f01cffabf120b36daa96dfca273e46cbbf (patch) | |
| tree | 7b74627b63076fdd676e37c5b5ec7b54db3bb6d6 | |
| parent | 68de5ef4c786f63bf19b146fa009ee9208318d0b (diff) | |
| parent | cc5b3403f0248ca5f40539d33f0e127ccca25dd2 (diff) | |
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: Daniel Borkmann <daniel@iogearbox.net>
| -rw-r--r-- | tools/bpf/Makefile | 4 | ||||
| -rw-r--r-- | tools/bpf/bpftool/Makefile | 4 | ||||
| -rw-r--r-- | tools/bpf/bpftool/xlated_dumper.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile index c07b4e718eeb..1ea545965ee3 100644 --- a/tools/bpf/Makefile +++ b/tools/bpf/Makefile @@ -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 diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 4c2867481f5c..4e69782c4a79 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -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) diff --git a/tools/bpf/bpftool/xlated_dumper.h b/tools/bpf/bpftool/xlated_dumper.h index 51c935d38ae2..b34affa7ef2d 100644 --- a/tools/bpf/bpftool/xlated_dumper.h +++ b/tools/bpf/bpftool/xlated_dumper.h @@ -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); |