[PATCH v2 17/62] objtool: Fix weak symbol detection

[Josh Poimboeuf]

find_symbol_hole_containing() fails to find a symbol hole (aka stripped
weak symbol) if its section has no symbols before the hole.  This breaks
weak symbol detection if -ffunction-sections is enabled.

Fix that by allowing the interval tree to contain section symbols, which
are always at offset zero for a given section.

Fixes a bunch of (-ffunction-sections) warnings like:

  vmlinux.o: warning: objtool: .text.__x64_sys_io_setup+0x10: unreachable 
instruction

Fixes: 4adb23686795 ("objtool: Ignore extra-symbol code")
Signed-off-by: Josh Poimboeuf <jpoim...@kernel.org>
---
 tools/include/linux/interval_tree_generic.h | 2 +-
 tools/objtool/elf.c                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/include/linux/interval_tree_generic.h 
b/tools/include/linux/interval_tree_generic.h
index aaa8a0767aa3..c0ec9dbdfbaf 100644
--- a/tools/include/linux/interval_tree_generic.h
+++ b/tools/include/linux/interval_tree_generic.h
@@ -77,7 +77,7 @@ ITSTATIC void ITPREFIX ## _remove(ITSTRUCT *node,             
              \
  *   Cond2: start <= ITLAST(node)                                            \
  */                                                                          \
                                                                              \
-static ITSTRUCT *                                                            \
+ITSTATIC ITSTRUCT *                                                          \
 ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last)       \
 {                                                                            \
        while (true) {                                                        \
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index c024937eb12a..d7fb3d0b05cf 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -109,7 +109,7 @@ struct symbol_hole {
 };
 
 /*
- * Find !section symbol where @offset is after it.
+ * Find the last symbol before @offset.
  */
 static int symbol_hole_by_offset(const void *key, const struct rb_node *node)
 {
@@ -120,8 +120,7 @@ static int symbol_hole_by_offset(const void *key, const 
struct rb_node *node)
                return -1;
 
        if (sh->key >= s->offset + s->len) {
-               if (s->type != STT_SECTION)
-                       sh->sym = s;
+               sh->sym = s;
                return 1;
        }
 
@@ -428,7 +427,8 @@ static void elf_add_symbol(struct elf *elf, struct symbol 
*sym)
        sym->len = sym->sym.st_size;
 
        __sym_for_each(iter, &sym->sec->symbol_tree, sym->offset, sym->offset) {
-               if (iter->offset == sym->offset && iter->type == sym->type)
+               if (iter->offset == sym->offset && iter->type == sym->type &&
+                   iter->len == sym->len)
                        iter->alias = sym;
        }
 
-- 
2.49.0