objtool: Add empty symbols to the symbol tree again

The following commit

  5da6aea375cd ("objtool: Fix find_{symbol,func}_containing()")

fixed the issue where overlapping symbols weren't getting sorted
properly in the symbol tree.  Therefore the workaround to skip adding
empty symbols from the following commit

  a2e38dffcd93 ("objtool: Don't add empty symbols to the rbtree")

is no longer needed.

Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 19e249f4783cf3103a2d683139a0191a8c47e29c..a8a78b55d3eceea40c7e8269dfd47f0932b533cb 100644 (file)
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -96,7 +96,8 @@ static inline unsigned long __sym_last(struct symbol *s)
 }
 
 INTERVAL_TREE_DEFINE(struct symbol, node, unsigned long, __subtree_last,
-                    __sym_start, __sym_last, static, __sym)
+                    __sym_start, __sym_last, static inline __maybe_unused,
+                    __sym)
 
 #define __sym_for_each(_iter, _tree, _start, _end)                     \
        for (_iter = __sym_iter_first((_tree), (_start), (_end));       \
@@ -440,13 +441,6 @@ static void elf_add_symbol(struct elf *elf, struct symbol *sym)
        list_add(&sym->list, entry);
        elf_hash_add(symbol, &sym->hash, sym->idx);
        elf_hash_add(symbol_name, &sym->name_hash, str_hash(sym->name));
-
-       /*
-        * Don't store empty STT_NOTYPE symbols in the rbtree.  They
-        * can exist within a function, confusing the sorting.
-        */
-       if (!sym->len)
-               __sym_remove(sym, &sym->sec->symbol_tree);
 }
 
 static int read_symbols(struct elf *elf)