1 files changed, 11 insertions, 3 deletions

diff --git a/tools/bpf/bpf_jit_disasm.c b/tools/bpf/bpf_jit_disasm.c
index 75bf526a0168..58c2bab4ef6e 100644
--- a/tools/bpf/bpf_jit_disasm.c
+++ b/tools/bpf/bpf_jit_disasm.c
@@ -72,7 +72,14 @@ static void get_asm_insns(uint8_t *image, size_t len, int opcodes)
 
         disassemble_init_for_target(&info);
 
+#ifdef DISASM_FOUR_ARGS_SIGNATURE
+        disassemble = disassembler(info.arch,
+                                   bfd_big_endian(bfdf),
+                                   info.mach,
+                                   bfdf);
+#else
         disassemble = disassembler(bfdf);
+#endif
         assert(disassemble);
 
         do {
@@ -165,7 +172,8 @@ static uint8_t *get_last_jit_image(char *haystack, size_t hlen,
 {
         char *ptr, *pptr, *tmp;
         off_t off = 0;
-        int ret, flen, proglen, pass, ulen = 0;
+        unsigned int proglen;
+        int ret, flen, pass, ulen = 0;
         regmatch_t pmatch[1];
         unsigned long base;
         regex_t regex;
@@ -192,7 +200,7 @@ static uint8_t *get_last_jit_image(char *haystack, size_t hlen,
         }
 
         ptr = haystack + off - (pmatch[0].rm_eo - pmatch[0].rm_so);
-        ret = sscanf(ptr, "flen=%d proglen=%d pass=%d image=%lx",
+        ret = sscanf(ptr, "flen=%d proglen=%u pass=%d image=%lx",
                      &flen, &proglen, &pass, &base);
         if (ret != 4) {
                 regfree(&regex);
@@ -232,7 +240,7 @@ static uint8_t *get_last_jit_image(char *haystack, size_t hlen,
         }
 
         assert(ulen == proglen);
-        printf("%d bytes emitted from JIT compiler (pass:%d, flen:%d)\n",
+        printf("%u bytes emitted from JIT compiler (pass:%d, flen:%d)\n",
                proglen, pass, flen);
         printf("%lx + <x>:\n", base);