diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 13:33:18 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 13:33:18 +0000 |
| commit | 32c075e1f01849e161724bbd400ba77244e482cc (patch) | |
| tree | 5f083a3f352104f32bb6c902d57fa3f294bd8d4d /sysdeps/sparc/sparc64 | |
| parent | d6220e9ee38c1c9285221b023346201ec5f511b3 (diff) | |
| download | glibc-32c075e1f01849e161724bbd400ba77244e482cc.tar glibc-32c075e1f01849e161724bbd400ba77244e482cc.tar.gz glibc-32c075e1f01849e161724bbd400ba77244e482cc.tar.bz2 glibc-32c075e1f01849e161724bbd400ba77244e482cc.zip | |
.
Diffstat (limited to 'sysdeps/sparc/sparc64')
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 3eee672912..314a784dbc 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -240,7 +240,7 @@ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc, 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 RTLD_BOOTSTRAP || USE___THREAD +#if defined USE_TLS && (!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)) \ @@ -589,7 +589,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, sparc64_fixup_plt (map, reloc, reloc_addr, value, reloc->r_addend, 0); #endif break; -#if (!defined RTLD_BOOTSTRAP || USE___THREAD) \ +#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD) \ && !defined RESOLVE_CONFLICT_FIND_MAP case R_SPARC_TLS_DTPMOD64: /* Get the information from the link map returned by the |