Merge branch '00.00-inst' of git://github.com/skeggsb/linux into drm-fixes

[linux-2.6-microblaze.git] / tools / objtool / elf.c

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index d8421e1..93fa833 100644 (file)
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -15,10 +15,10 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include "builtin.h"
+#include <objtool/builtin.h>
 
-#include "elf.h"
-#include "warn.h"
+#include <objtool/elf.h>
+#include <objtool/warn.h>
 
 #define MAX_NAME_LEN 128
 
@@ -43,75 +43,24 @@ static void elf_hash_init(struct hlist_head *table)
 #define elf_hash_for_each_possible(name, obj, member, key)                     \
        hlist_for_each_entry(obj, &name[hash_min(key, elf_hash_bits())], member)
 
-static void rb_add(struct rb_root *tree, struct rb_node *node,
-                  int (*cmp)(struct rb_node *, const struct rb_node *))
-{
-       struct rb_node **link = &tree->rb_node;
-       struct rb_node *parent = NULL;
-
-       while (*link) {
-               parent = *link;
-               if (cmp(node, parent) < 0)
-                       link = &parent->rb_left;
-               else
-                       link = &parent->rb_right;
-       }
-
-       rb_link_node(node, parent, link);
-       rb_insert_color(node, tree);
-}
-
-static struct rb_node *rb_find_first(const struct rb_root *tree, const void *key,
-                              int (*cmp)(const void *key, const struct rb_node *))
-{
-       struct rb_node *node = tree->rb_node;
-       struct rb_node *match = NULL;
-
-       while (node) {
-               int c = cmp(key, node);
-               if (c <= 0) {
-                       if (!c)
-                               match = node;
-                       node = node->rb_left;
-               } else if (c > 0) {
-                       node = node->rb_right;
-               }
-       }
-
-       return match;
-}
-
-static struct rb_node *rb_next_match(struct rb_node *node, const void *key,
-                                   int (*cmp)(const void *key, const struct rb_node *))
-{
-       node = rb_next(node);
-       if (node && cmp(key, node))
-               node = NULL;
-       return node;
-}
-
-#define rb_for_each(tree, node, key, cmp) \
-       for ((node) = rb_find_first((tree), (key), (cmp)); \
-            (node); (node) = rb_next_match((node), (key), (cmp)))
-
-static int symbol_to_offset(struct rb_node *a, const struct rb_node *b)
+static bool symbol_to_offset(struct rb_node *a, const struct rb_node *b)
 {
        struct symbol *sa = rb_entry(a, struct symbol, node);
        struct symbol *sb = rb_entry(b, struct symbol, node);
 
        if (sa->offset < sb->offset)
-               return -1;
+               return true;
        if (sa->offset > sb->offset)
-               return 1;
+               return false;
 
        if (sa->len < sb->len)
-               return -1;
+               return true;
        if (sa->len > sb->len)
-               return 1;
+               return false;
 
        sa->alias = sb;
 
-       return 0;
+       return false;
 }
 
 static int symbol_by_offset(const void *key, const struct rb_node *node)
@@ -165,7 +114,7 @@ struct symbol *find_symbol_by_offset(struct section *sec, unsigned long offset)
 {
        struct rb_node *node;
 
-       rb_for_each(&sec->symbol_tree, node, &offset, symbol_by_offset) {
+       rb_for_each(node, &offset, &sec->symbol_tree, symbol_by_offset) {
                struct symbol *s = rb_entry(node, struct symbol, node);
 
                if (s->offset == offset && s->type != STT_SECTION)
@@ -179,7 +128,7 @@ struct symbol *find_func_by_offset(struct section *sec, unsigned long offset)
 {
        struct rb_node *node;
 
-       rb_for_each(&sec->symbol_tree, node, &offset, symbol_by_offset) {
+       rb_for_each(node, &offset, &sec->symbol_tree, symbol_by_offset) {
                struct symbol *s = rb_entry(node, struct symbol, node);
 
                if (s->offset == offset && s->type == STT_FUNC)
@@ -193,7 +142,7 @@ struct symbol *find_symbol_containing(const struct section *sec, unsigned long o
 {
        struct rb_node *node;
 
-       rb_for_each(&sec->symbol_tree, node, &offset, symbol_by_offset) {
+       rb_for_each(node, &offset, &sec->symbol_tree, symbol_by_offset) {
                struct symbol *s = rb_entry(node, struct symbol, node);
 
                if (s->type != STT_SECTION)
@@ -207,7 +156,7 @@ struct symbol *find_func_containing(struct section *sec, unsigned long offset)
 {
        struct rb_node *node;
 
-       rb_for_each(&sec->symbol_tree, node, &offset, symbol_by_offset) {
+       rb_for_each(node, &offset, &sec->symbol_tree, symbol_by_offset) {
                struct symbol *s = rb_entry(node, struct symbol, node);
 
                if (s->type == STT_FUNC)
@@ -442,7 +391,7 @@ static int read_symbols(struct elf *elf)
                sym->offset = sym->sym.st_value;
                sym->len = sym->sym.st_size;
 
-               rb_add(&sym->sec->symbol_tree, &sym->node, symbol_to_offset);
+               rb_add(&sym->node, &sym->sec->symbol_tree, symbol_to_offset);
                pnode = rb_prev(&sym->node);
                if (pnode)
                        entry = &rb_entry(pnode, struct symbol, node)->list;
@@ -865,25 +814,27 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr)
 {
        struct reloc *reloc;
        int idx = 0, size;
-       GElf_Rel *relocs;
+       void *buf;
 
        /* Allocate a buffer for relocations */
-       size = nr * sizeof(*relocs);
-       relocs = malloc(size);
-       if (!relocs) {
+       size = nr * sizeof(GElf_Rel);
+       buf = malloc(size);
+       if (!buf) {
                perror("malloc");
                return -1;
        }
 
-       sec->data->d_buf = relocs;
+       sec->data->d_buf = buf;
        sec->data->d_size = size;
+       sec->data->d_type = ELF_T_REL;
 
        sec->sh.sh_size = size;
 
        idx = 0;
        list_for_each_entry(reloc, &sec->reloc_list, list) {
-               relocs[idx].r_offset = reloc->offset;
-               relocs[idx].r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
+               reloc->rel.r_offset = reloc->offset;
+               reloc->rel.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
+               gelf_update_rel(sec->data, idx, &reloc->rel);
                idx++;
        }
 
@@ -894,26 +845,28 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr)
 {
        struct reloc *reloc;
        int idx = 0, size;
-       GElf_Rela *relocs;
+       void *buf;
 
        /* Allocate a buffer for relocations with addends */
-       size = nr * sizeof(*relocs);
-       relocs = malloc(size);
-       if (!relocs) {
+       size = nr * sizeof(GElf_Rela);
+       buf = malloc(size);
+       if (!buf) {
                perror("malloc");
                return -1;
        }
 
-       sec->data->d_buf = relocs;
+       sec->data->d_buf = buf;
        sec->data->d_size = size;
+       sec->data->d_type = ELF_T_RELA;
 
        sec->sh.sh_size = size;
 
        idx = 0;
        list_for_each_entry(reloc, &sec->reloc_list, list) {
-               relocs[idx].r_offset = reloc->offset;
-               relocs[idx].r_addend = reloc->addend;
-               relocs[idx].r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
+               reloc->rela.r_offset = reloc->offset;
+               reloc->rela.r_addend = reloc->addend;
+               reloc->rela.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
+               gelf_update_rela(sec->data, idx, &reloc->rela);
                idx++;
        }