commit d6c6835f27225b820365fc7950c635541adfdc42
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 07 19:29:22 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 07 19:29:22 2022 +0000
tree 37bc426f0c26a89df884bbe9286b88b00ed115f5
parent e1b518ce76a23d2a6cd487684f7f0740badf79be
parent 21869ef9353a445837c0cea9690676e4be269bc0

Merge "BpfLoader v0.25 - add support for obj@ver.o"

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index bb816fd..859d1c5 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -936,10 +936,9 @@
     insnIndex = offset / sizeof(struct bpf_insn);
     insn = &insns[insnIndex];
 
-    ALOGD(
-        "applying relo to instruction at byte offset: %d, \
-	       insn offset %d , insn %lx\n",
-        (int)offset, (int)insnIndex, *(unsigned long*)insn);
+    ALOGD("applying relo to instruction at byte offset: %llu, "
+          "insn offset %d, insn %llx",
+          (unsigned long long)offset, insnIndex, *(unsigned long long*)insn);
 
     if (insn->code != (BPF_LD | BPF_IMM | BPF_DW)) {
         ALOGE("Dumping all instructions till ins %d", insnIndex);