2 files changed, 11 insertions, 15 deletions

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 4b9816555946..2a83414159a6 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -337,7 +337,7 @@ static void callchain_node__init_have_children(struct callchain_node *node,
         chain = list_entry(node->val.next, struct callchain_list, list);
         chain->has_children = has_sibling;
 
-        if (node->val.next != node->val.prev) {
+        if (!list_empty(&node->val)) {
                 chain = list_entry(node->val.prev, struct callchain_list, list);
                 chain->has_children = !RB_EMPTY_ROOT(&node->rb_root);
         }
diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
index cd67e64a0494..2fbeb59c4bdd 100644
--- a/tools/perf/util/genelf.h
+++ b/tools/perf/util/genelf.h
@@ -9,36 +9,32 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
 
 #if   defined(__arm__)
 #define GEN_ELF_ARCH    EM_ARM
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS32
 #elif defined(__aarch64__)
 #define GEN_ELF_ARCH    EM_AARCH64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
 #elif defined(__x86_64__)
 #define GEN_ELF_ARCH    EM_X86_64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
 #elif defined(__i386__)
 #define GEN_ELF_ARCH    EM_386
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS32
-#elif defined(__ppcle__)
-#define GEN_ELF_ARCH    EM_PPC
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
-#define GEN_ELF_CLASS   ELFCLASS64
-#elif defined(__powerpc__)
-#define GEN_ELF_ARCH    EM_PPC64
-#define GEN_ELF_ENDIAN  ELFDATA2MSB
-#define GEN_ELF_CLASS   ELFCLASS64
-#elif defined(__powerpcle__)
+#elif defined(__powerpc64__)
 #define GEN_ELF_ARCH    EM_PPC64
-#define GEN_ELF_ENDIAN  ELFDATA2LSB
 #define GEN_ELF_CLASS   ELFCLASS64
+#elif defined(__powerpc__)
+#define GEN_ELF_ARCH    EM_PPC
+#define GEN_ELF_CLASS   ELFCLASS32
 #else
 #error "unsupported architecture"
 #endif
 
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define GEN_ELF_ENDIAN  ELFDATA2MSB
+#else
+#define GEN_ELF_ENDIAN  ELFDATA2LSB
+#endif
+
 #if GEN_ELF_CLASS == ELFCLASS64
 #define elf_newehdr     elf64_newehdr
 #define elf_getshdr     elf64_getshdr