diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index f7e54f5a79..16e3fc3f70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-27 Roland McGrath <roland@redhat.com> + + * sysdeps/x86_64/dl-machine.h (elf_machine_type_class): Remove + unneeded TLS cases. + 2002-09-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-addr.c (_dl_addr): Set dli_fbase to l_map_start diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 6179bba3f7..b55523649b 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -289,12 +289,11 @@ _dl_start_user:\n\ 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. */ #ifdef USE_TLS -# define elf_machine_type_class(type) \ - ((((type) == R_X86_64_JUMP_SLOT - || (type) == R_X86_64_DTPMOD64 - || (type) == R_X86_64_DTPOFF64 || (type) == R_X86_64_DTPOFF32 - || (type) == R_X86_64_TPOFF64 || (type) == R_X86_64_TPOFF32) - * ELF_RTYPE_CLASS_PLT) \ +# define elf_machine_type_class(type) \ + ((((type) == R_X86_64_JUMP_SLOT \ + || (type) == R_X86_64_DTPMOD64 \ + || (type) == R_X86_64_DTPOFF64 || (type) == R_X86_64_TPOFF64) \ + * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_X86_64_COPY) * ELF_RTYPE_CLASS_COPY)) #else # define elf_machine_type_class(type) \ |