diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-05-17 18:59:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-05-17 18:59:35 +0000 |
| commit | d40eb37aad4145ae4d047b6d7f633f740bf3a610 (patch) | |
| tree | c2ff0130b68574a0b45bf63e0653f8c58b5a7bd1 /sysdeps/sparc/sparc32/dl-machine.h | |
| parent | cc24242da7cddba154275547da89516eca6a0f88 (diff) | |
| download | glibc-d40eb37aad4145ae4d047b6d7f633f740bf3a610.tar.gz | |
[BZ #40]
Update.
2004-05-15 Petter Reinholdtsen <pere@hungry.com>
* locale/iso-3166.def: Remove YUGOSLAVIA and insert "SERBIA AND
MONTENEGRO" which have taken over the code 819. Patch from
Danilo Segan. [BZ #40]
2004-05-15 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
(SYSCALL_ERROR_HANDLER): Rename __sparc.get_pic.l7 to
__sparc_get_pic_l7.
2004-05-15 Joseph S. Myers <jsm@polyomino.org.uk>
* catgets/gencat.c: Update bug reporting instructions.
* csu/version.c: Likewise.
* debug/catchsegv.sh: Likewise.
* debug/pcprofiledump.c: Likewise.
* debug/xtrace.sh: Likewise.
* elf/ldd.bash.in: Likewise.
* iconv/iconv_prog.c: Likewise.
* iconv/iconvconfig.c: Likewise.
* locale/programs/locale.c: Likewise.
* locale/programs/localedef.c: Likewise.
* login/programs/pt_chown.c: Likewise.
* malloc/memusage.sh: Likewise.
* malloc/memusagestat.c: Likewise.
* malloc/mtrace.pl: Likewise.
* manual/crypt.texi: Likewise.
* manual/install.texi: Likewise.
* nss/makedb.c: Likewise.
2004-05-14 Jakub Jelinek <jakub@redhat.com>
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Only
CHECK_STATIC_TLS if sym != NULL.
* sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise.
* sysdeps/i386/dl-machine.h (elf_machine_rela): Likewise.
2004-05-12 Andreas Schwab <schwab@suse.de>
* posix/regex_internal.c (build_wcs_buffer): Also set pstr->mbs
when translating.
2004-05-13 H.J. Lu <hongjiu.lu@intel.com>
* Rules (xtests): Depend on tests.
Diffstat (limited to 'sysdeps/sparc/sparc32/dl-machine.h')
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 5f39949c00..52fc6329dd 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -521,22 +521,27 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, /* We know the offset of object the symbol is contained in. It is a negative value which will be added to the thread pointer. */ - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr - = (sym == NULL ? 0 : 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; # ifndef RTLD_BOOTSTRAP case R_SPARC_TLS_LE_HIX22: case R_SPARC_TLS_LE_LOX10: - CHECK_STATIC_TLS (map, sym_map); - value = (sym == NULL ? 0 : sym->st_value - sym_map->l_tls_offset) - + reloc->r_addend; - if (r_type == R_SPARC_TLS_LE_HIX22) - *reloc_addr = (*reloc_addr & 0xffc00000) | ((~value) >> 10); - else - *reloc_addr = (*reloc_addr & 0xffffe000) | (value & 0x3ff) - | 0x1c00; + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + value = sym->st_value - sym_map->l_tls_offset + + reloc->r_addend; + if (r_type == R_SPARC_TLS_LE_HIX22) + *reloc_addr = (*reloc_addr & 0xffc00000) | ((~value) >> 10); + else + *reloc_addr = (*reloc_addr & 0xffffe000) | (value & 0x3ff) + | 0x1c00; + } break; # endif #endif |