diff options
| author | Petr Machata <[email protected]> | 2009-06-16 15:22:04 +0200 |
|---|---|---|
| committer | Petr Machata <[email protected]> | 2009-06-16 15:22:04 +0200 |
| commit | 9e38b7374a0b9cb7aa77c2ad8afe5aac7182d337 (patch) | |
| tree | ca307d5078971fdef16f324e8ffd32b25ddd0df1 /libdwfl | |
| parent | 77abb31cb8d55980ef92260917a7ecdd228b1a44 (diff) | |
| parent | 99d2372b25d1231d786b70278478c7a112f2b27c (diff) | |
Merge branch 'master' of ssh://[email protected]/git/elfutils into pmachata/reader_hooksupstream/pmachata/reader_hooks
Diffstat (limited to 'libdwfl')
| -rw-r--r-- | libdwfl/ChangeLog | 6 | ||||
| -rw-r--r-- | libdwfl/derelocate.c | 2 | ||||
| -rw-r--r-- | libdwfl/dwfl_module_getdwarf.c | 2 | ||||
| -rw-r--r-- | libdwfl/relocate.c | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 8f51ca73..97e888f0 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,9 @@ +2009-06-13 Ulrich Drepper <[email protected]> + + * derelocate.c: Don't use deprecated libelf functions. + * dwfl_module_getdwarf.c: Likewise. + * relocate.c: Likewise. + 2009-04-23 Ulrich Drepper <[email protected]> * dwfl_module_build_id.c: Define versioned symbols only if SHARED is diff --git a/libdwfl/derelocate.c b/libdwfl/derelocate.c index c300f84b..56ba25af 100644 --- a/libdwfl/derelocate.c +++ b/libdwfl/derelocate.c @@ -94,7 +94,7 @@ cache_sections (Dwfl_Module *mod) size_t nrefs = 0; size_t shstrndx; - if (unlikely (elf_getshstrndx (mod->main.elf, &shstrndx) < 0)) + if (unlikely (elf_getshdrstrndx (mod->main.elf, &shstrndx) < 0)) { elf_error: __libdwfl_seterrno (DWFL_E_LIBELF); diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c index 06cb4917..f48fabe7 100644 --- a/libdwfl/dwfl_module_getdwarf.c +++ b/libdwfl/dwfl_module_getdwarf.c @@ -148,7 +148,7 @@ static const char * find_debuglink (Elf *elf, GElf_Word *crc) { size_t shstrndx; - if (elf_getshstrndx (elf, &shstrndx) < 0) + if (elf_getshdrstrndx (elf, &shstrndx) < 0) return NULL; Elf_Scn *scn = NULL; diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c index 2c0f3010..a31fe152 100644 --- a/libdwfl/relocate.c +++ b/libdwfl/relocate.c @@ -72,7 +72,7 @@ __libdwfl_relocate_value (Dwfl_Module *mod, Elf *elf, size_t *shstrndx, address and update the section header. */ if (*shstrndx == SHN_UNDEF - && unlikely (elf_getshstrndx (elf, shstrndx) < 0)) + && unlikely (elf_getshdrstrndx (elf, shstrndx) < 0)) return DWFL_E_LIBELF; const char *name = elf_strptr (elf, *shstrndx, refshdr->sh_name); @@ -582,7 +582,7 @@ __libdwfl_relocate (Dwfl_Module *mod, Elf *debugfile, bool debug) return DWFL_E_LIBELF; size_t d_shstrndx; - if (elf_getshstrndx (debugfile, &d_shstrndx) < 0) + if (elf_getshdrstrndx (debugfile, &d_shstrndx) < 0) return DWFL_E_LIBELF; RELOC_SYMTAB_CACHE (reloc_symtab); @@ -626,7 +626,7 @@ __libdwfl_relocate_section (Dwfl_Module *mod, Elf *relocated, RELOC_SYMTAB_CACHE (reloc_symtab); size_t shstrndx; - if (elf_getshstrndx (relocated, &shstrndx) < 0) + if (elf_getshdrstrndx (relocated, &shstrndx) < 0) return DWFL_E_LIBELF; return (__libdwfl_module_getebl (mod) |