3 files changed, 38 insertions, 13 deletions

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index e3c1ff8512c8..6bfc8aacaf7c 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -7,19 +7,20 @@
 char dso__symtab_origin(const struct dso *dso)
 {
         static const char origin[] = {
-                [DSO_BINARY_TYPE__KALLSYMS]             = 'k',
-                [DSO_BINARY_TYPE__VMLINUX]              = 'v',
-                [DSO_BINARY_TYPE__JAVA_JIT]             = 'j',
-                [DSO_BINARY_TYPE__DEBUGLINK]            = 'l',
-                [DSO_BINARY_TYPE__BUILD_ID_CACHE]       = 'B',
-                [DSO_BINARY_TYPE__FEDORA_DEBUGINFO]     = 'f',
-                [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO]     = 'u',
-                [DSO_BINARY_TYPE__BUILDID_DEBUGINFO]    = 'b',
-                [DSO_BINARY_TYPE__SYSTEM_PATH_DSO]      = 'd',
-                [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE]  = 'K',
-                [DSO_BINARY_TYPE__GUEST_KALLSYMS]       = 'g',
-                [DSO_BINARY_TYPE__GUEST_KMODULE]        = 'G',
-                [DSO_BINARY_TYPE__GUEST_VMLINUX]        = 'V',
+                [DSO_BINARY_TYPE__KALLSYMS]                     = 'k',
+                [DSO_BINARY_TYPE__VMLINUX]                      = 'v',
+                [DSO_BINARY_TYPE__JAVA_JIT]                     = 'j',
+                [DSO_BINARY_TYPE__DEBUGLINK]                    = 'l',
+                [DSO_BINARY_TYPE__BUILD_ID_CACHE]               = 'B',
+                [DSO_BINARY_TYPE__FEDORA_DEBUGINFO]             = 'f',
+                [DSO_BINARY_TYPE__UBUNTU_DEBUGINFO]             = 'u',
+                [DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO]       = 'o',
+                [DSO_BINARY_TYPE__BUILDID_DEBUGINFO]            = 'b',
+                [DSO_BINARY_TYPE__SYSTEM_PATH_DSO]              = 'd',
+                [DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE]          = 'K',
+                [DSO_BINARY_TYPE__GUEST_KALLSYMS]               = 'g',
+                [DSO_BINARY_TYPE__GUEST_KMODULE]                = 'G',
+                [DSO_BINARY_TYPE__GUEST_VMLINUX]                = 'V',
         };
 
         if (dso == NULL || dso->symtab_type == DSO_BINARY_TYPE__NOT_FOUND)
@@ -64,6 +65,28 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type,
                          symbol_conf.symfs, dso->long_name);
                 break;
 
+        case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO:
+        {
+                char *last_slash;
+                size_t len;
+                size_t dir_size;
+
+                last_slash = dso->long_name + dso->long_name_len;
+                while (last_slash != dso->long_name && *last_slash != '/')
+                        last_slash--;
+
+                len = scnprintf(file, size, "%s", symbol_conf.symfs);
+                dir_size = last_slash - dso->long_name + 2;
+                if (dir_size > (size - len)) {
+                        ret = -1;
+                        break;
+                }
+                len += scnprintf(file + len, dir_size, "%s",  dso->long_name);
+                len += scnprintf(file + len , size - len, ".debug%s",
+                                                                last_slash);
+                break;
+        }
+
         case DSO_BINARY_TYPE__BUILDID_DEBUGINFO:
                 if (!dso->has_build_id) {
                         ret = -1;
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index b793053335d6..dbd9241ea290 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -23,6 +23,7 @@ enum dso_binary_type {
         DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE,
         DSO_BINARY_TYPE__KCORE,
         DSO_BINARY_TYPE__GUEST_KCORE,
+        DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO,
         DSO_BINARY_TYPE__NOT_FOUND,
 };
 
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 7eb0362f4ffd..cd1dcc45049b 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -51,6 +51,7 @@ static enum dso_binary_type binary_type_symtab[] = {
         DSO_BINARY_TYPE__SYSTEM_PATH_DSO,
         DSO_BINARY_TYPE__GUEST_KMODULE,
         DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE,
+        DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO,
         DSO_BINARY_TYPE__NOT_FOUND,
 };