diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-object.c | 2 | ||||
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2eadb41b81..52bdb75712 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-09-08 Ben Collins <bcollins@debian.org> + + * sysdeps/arm/dl-machine.h (elf_machine_rel): Fix thinko in + usage of RESOLVE() (r_type, not reloc->r_type). + 2001-09-08 Ulrich Drepper <drepper@redhat.com> * elf/dl-object.c: Avoid allocating extra memory block for name. diff --git a/elf/dl-object.c b/elf/dl-object.c index bfd4f2d8c4..9406ea1787 100644 --- a/elf/dl-object.c +++ b/elf/dl-object.c @@ -47,7 +47,7 @@ _dl_new_object (char *realname, const char *libname, int type, newname = (struct libname_list *) (new + 1); newname->name = (char *) memcpy (newname + 1, libname, libname_len); - newname->next = NULL; + /* newname->next = NULL; We use calloc therefore not necessary. */ newname->dont_free = 1; new->l_name = realname; diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 6abac52c90..2d802b7e9b 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -428,7 +428,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, else { const Elf32_Sym *const refsym = sym; - Elf32_Addr value = RESOLVE (&sym, version, reloc->r_type); + Elf32_Addr value = RESOLVE (&sym, version, r_type); if (sym) value += sym->st_value; |