diff options
| author | Daniel Jacobowitz <dan@codesourcery.com> | 2006-09-21 18:21:19 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@codesourcery.com> | 2006-09-21 18:21:19 +0000 |
| commit | 56865130d06d032b2c44b188eb841d481a3d0bad (patch) | |
| tree | 93e42e15d8a9251790f6a1b2fdac89436509863d | |
| parent | 7cad09f90b24a38e5b013b7c7c9711aaa1593797 (diff) | |
| download | glibc-56865130d06d032b2c44b188eb841d481a3d0bad.tar.xz glibc-56865130d06d032b2c44b188eb841d481a3d0bad.zip | |
* sysdeps/arm/dl-machine.h (elf_machine_rel): Handle undefined
symbols.
(elf_machine_rela): Likewise.
| -rw-r--r-- | ChangeLog.arm | 6 | ||||
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm index 8702925b95..3effa9dc5c 100644 --- a/ChangeLog.arm +++ b/ChangeLog.arm @@ -1,3 +1,9 @@ +2006-09-21 Daniel Jacobowitz <dan@codesourcery.com> + + * sysdeps/arm/dl-machine.h (elf_machine_rel): Handle undefined + symbols. + (elf_machine_rela): Likewise. + 2006-08-21 Daniel Jacobowitz <dan@codesourcery.com> * sysdeps/unix/sysv/linux/arm/eabi/syscalls.list: Remove msgctl, diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index ff8a170668..1a45a2613c 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -447,12 +447,16 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, break; case R_ARM_TLS_DTPOFF32: - *reloc_addr += sym->st_value; + if (sym != NULL) + *reloc_addr += sym->st_value; break; case R_ARM_TLS_TPOFF32: - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr += sym->st_value + sym_map->l_tls_offset; + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + *reloc_addr += sym->st_value + sym_map->l_tls_offset; + } break; #endif default: @@ -544,13 +548,16 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, break; case R_ARM_TLS_DTPOFF32: - *reloc_addr = sym->st_value + reloc->r_addend; + *reloc_addr = (sym == NULL ? 0 : sym->st_value) + reloc->r_addend; break; case R_ARM_TLS_TPOFF32: - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr = (sym->st_value + sym_map->l_tls_offset - + reloc->r_addend); + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + *reloc_addr = (sym->st_value + sym_map->l_tls_offset + + reloc->r_addend); + } break; #endif default: |
