1 files changed, 34 insertions, 1 deletions

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index cef8f426356e..d75349979e65 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -622,7 +622,7 @@ int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
                 GElf_Shdr shdr;
                 ss->adjust_symbols = (ehdr.e_type == ET_EXEC ||
                                 ehdr.e_type == ET_REL ||
-                                is_vdso_map(dso->short_name) ||
+                                dso__is_vdso(dso) ||
                                 elf_section_by_name(elf, &ehdr, &shdr,
                                                      ".gnu.prelink_undo",
                                                      NULL) != NULL);
@@ -1028,6 +1028,39 @@ int file__read_maps(int fd, bool exe, mapfn_t mapfn, void *data,
         return err;
 }
 
+enum dso_type dso__type_fd(int fd)
+{
+        enum dso_type dso_type = DSO__TYPE_UNKNOWN;
+        GElf_Ehdr ehdr;
+        Elf_Kind ek;
+        Elf *elf;
+
+        elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
+        if (elf == NULL)
+                goto out;
+
+        ek = elf_kind(elf);
+        if (ek != ELF_K_ELF)
+                goto out_end;
+
+        if (gelf_getclass(elf) == ELFCLASS64) {
+                dso_type = DSO__TYPE_64BIT;
+                goto out_end;
+        }
+
+        if (gelf_getehdr(elf, &ehdr) == NULL)
+                goto out_end;
+
+        if (ehdr.e_machine == EM_X86_64)
+                dso_type = DSO__TYPE_X32BIT;
+        else
+                dso_type = DSO__TYPE_32BIT;
+out_end:
+        elf_end(elf);
+out:
+        return dso_type;
+}
+
 static int copy_bytes(int from, off_t from_offs, int to, off_t to_offs, u64 len)
 {
         ssize_t r;