On Thu, Jun 3, 2021 at 10:06 AM Jean-Philippe Brucker
<jean-philippe@xxxxxxxxxx> wrote:
>
> When the bootstrap and final bpftool have different architectures, we
> need to build two distinct disasm.o objects. Add a recipe for the
> bootstrap disasm.o
>
> Fixes: d510296d331a ("bpftool: Use syscall/loader program in "prog load" and "gen skeleton" command.")
Did this commit break something specifically?
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@xxxxxxxxxx>
> ---
> tools/bpf/bpftool/Makefile | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> index d16d289ade7a..d73232be1e99 100644
> --- a/tools/bpf/bpftool/Makefile
> +++ b/tools/bpf/bpftool/Makefile
> @@ -136,7 +136,7 @@ endif
>
> BPFTOOL_BOOTSTRAP := $(BOOTSTRAP_OUTPUT)bpftool
>
> -BOOTSTRAP_OBJS = $(addprefix $(BOOTSTRAP_OUTPUT),main.o common.o json_writer.o gen.o btf.o xlated_dumper.o btf_dumper.o) $(OUTPUT)disasm.o
> +BOOTSTRAP_OBJS = $(addprefix $(BOOTSTRAP_OUTPUT),main.o common.o json_writer.o gen.o btf.o xlated_dumper.o btf_dumper.o disasm.o)
> OBJS = $(patsubst %.c,$(OUTPUT)%.o,$(SRCS)) $(OUTPUT)disasm.o
>
> VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \
> @@ -180,6 +180,9 @@ endif
>
> CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
>
> +$(BOOTSTRAP_OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
> + $(QUIET_CC)$(HOSTCC) $(CFLAGS) -c -MMD -o $@ $<
> +
> $(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
maybe just do
$(BOOTSTRAP_OUTPUT)disasm.o $(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
?
> $(QUIET_CC)$(CC) $(CFLAGS) -c -MMD -o $@ $<
>
> --
> 2.31.1
>
