• Jean-Philippe Brucker's avatar
    tools/bpftool: Fix cross-build · 0779890f
    Jean-Philippe Brucker authored
    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.
    
    After commit d510296d ("bpftool: Use syscall/loader program in
    "prog load" and "gen skeleton" command.") cross-building bpftool didn't
    work anymore, because the bootstrap bpftool was linked using objects
    from different architectures:
    
      $ make O=/tmp/bpftool ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/bpftool/ V=1
      [...]
      aarch64-linux-gnu-gcc ... -c -MMD -o /tmp/bpftool/disasm.o /home/z/src/linux/kernel/bpf/disasm.c
      gcc ... -c -MMD -o /tmp/bpftool//bootstrap/main.o main.c
      gcc ... -o /tmp/bpftool//bootstrap/bpftool /tmp/bpftool//bootstrap/main.o ... /tmp/bpftool/disasm.o
      /usr/bin/ld: /tmp/bpftool/disasm.o: Relocations in generic ELF (EM: 183)
      /usr/bin/ld: /tmp/bpftool/disasm.o: Relocations in generic ELF (EM: 183)
      /usr/bin/ld: /tmp/bpftool/disasm.o: Relocations in generic ELF (EM: 183)
      /usr/bin/ld: /tmp/bpftool/disasm.o: error adding symbols: file in wrong format
      collect2: error: ld returned 1 exit status
      [...]
    
    The final bpftool was built for e.g. arm64, while the bootstrap bpftool,
    executed on the host, was built for x86. The problem here was that disasm.o
    linked into the bootstrap bpftool was arm64 rather than x86. With the fix
    we build two disasm.o, one for the target bpftool in arm64, and one for
    the bootstrap bpftool in x86.
    
    Fixes: d510296d ("bpftool: Use syscall/loader program in "prog load" and "gen skeleton" command.")
    Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
    Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
    Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
    Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
    Link: https://lore.kernel.org/bpf/20210603170515.1854642-1-jean-philippe@linaro.org
    0779890f
Makefile 6.75 KB