diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
| commit | 8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5 (patch) | |
| tree | 196eec145dc3a6fb925a5b07d831b21d761d7c20 /sysdeps/sparc/sparc32/dl-machine.h | |
| parent | 48b752c9f6499f0de89766c94b3b1bedbfd6476e (diff) | |
| download | glibc-8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5.tar glibc-8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5.tar.gz glibc-8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5.tar.bz2 glibc-8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5.zip | |
Updated to fedora-glibc-20061029T2155cvs/fedora-glibc-2_5_90-3
Diffstat (limited to 'sysdeps/sparc/sparc32/dl-machine.h')
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 02dabaabb4..19aac6a7fe 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -188,7 +188,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) PLT entries should not be allowed to define the value. ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one of the main executable's symbols, as for a COPY reloc. */ -#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD) +#if !defined RTLD_BOOTSTRAP || USE___THREAD # define elf_machine_type_class(type) \ ((((type) == R_SPARC_JMP_SLOT \ || ((type) >= R_SPARC_TLS_GD_HI22 && (type) <= R_SPARC_TLS_TPOFF64)) \ @@ -459,7 +459,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, so we can optimize the first instruction of .plt out. */ sparc_fixup_plt (reloc, reloc_addr, value, 0); break; -#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD) \ +#if (!defined RTLD_BOOTSTRAP || USE___THREAD) \ && !defined RESOLVE_CONFLICT_FIND_MAP case R_SPARC_TLS_DTPMOD32: /* Get the information from the link map returned by the |