2 files changed, 7 insertions, 2 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 5eb5566f0c95..ec230a0146e9 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -797,7 +797,7 @@ resolve_symbol(struct thread *thread, struct map **mapp,
 {
         struct dso *dso = dsop ? *dsop : NULL;
         struct map *map = mapp ? *mapp : NULL;
-        uint64_t ip = *ipp;
+        u64 ip = *ipp;
 
         if (!thread)
                 return NULL;
@@ -814,7 +814,6 @@ resolve_symbol(struct thread *thread, struct map **mapp,
                         *mapp = map;
 got_map:
                 ip = map->map_ip(map, ip);
-                *ipp  = ip;
 
                 dso = map->dso;
         } else {
@@ -828,6 +827,8 @@ got_map:
                 dso = kernel_dso;
         }
         dprintf(" ...... dso: %s\n", dso ? dso->name : "<not found>");
+        dprintf(" ...... map: %Lx -> %Lx\n", *ipp, ip);
+        *ipp  = ip;
 
         if (dsop)
                 *dsop = dso;
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 01b62fa03996..9c659ef6aec2 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -535,6 +535,10 @@ static int dso__load_sym(struct dso *self, int fd, const char *name,
                 gelf_getshdr(sec, &shdr);
                 obj_start = sym.st_value;
 
+                if (verbose >= 2)
+                        printf("adjusting symbol: st_value: %Lx sh_addr: %Lx sh_offset: %Lx\n",
+                                (u64)sym.st_value, (u64)shdr.sh_addr, (u64)shdr.sh_offset);
+
                 sym.st_value -= shdr.sh_addr - shdr.sh_offset;
 
                 f = symbol__new(sym.st_value, sym.st_size,