Include tls.h.

(elf_machine_type_class): Return ELF_RTYPE_CLASS_PLT for TLS relocs too.
(elf_machine_rela): Assume if sym_map != NULL sym is non-NULL too.
Handle R_IA64_DTPMOD*, R_IA64_DTPREL* and R_IA64_TPREL* relocations.

diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h
index 16a1ff3..f5eeef6 100644 (file)
--- a/sysdeps/ia64/dl-machine.h
+++ b/sysdeps/ia64/dl-machine.h
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  IA-64 version.
-   Copyright (C) 1995,1996,1997,2000,2001,2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <link.h>
 #include <errno.h>
-
+#include <tls.h>
 
 /* Translate a processor specific dynamic tag to the index
    in l_info array.  */
@@ -448,14 +448,22 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
 #define RTLD_START_SPECIAL_INIT /* nothing */
 #endif
 
-/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
-   PLT entries should not be allowed to define the value.
+/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or TLS
+   variable, so undefined references 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, which we don't
    use.  */
-/* ??? Ignore IPLTMSB for now.  */
+/* ??? Ignore *MSB for now.  */
+#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
+#define elf_machine_type_class(type) \
+  (((type) == R_IA64_IPLTLSB || (type) == R_IA64_DTPMOD64LSB                 \
+    || (type) == R_IA64_DTPREL64LSB || (type) == R_IA64_TPREL64LSB)          \
+   * ELF_RTYPE_CLASS_PLT)
+#else
 #define elf_machine_type_class(type) \
   (((type) == R_IA64_IPLTLSB) * ELF_RTYPE_CLASS_PLT)
+#endif
 
 /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries.  */
 #define ELF_MACHINE_JMP_SLOT    R_IA64_IPLTLSB
@@ -557,8 +565,7 @@ elf_machine_rela (struct link_map *map,
       /* RESOLVE_MAP() will return NULL if it fail to locate the symbol.  */
       if ((sym_map = RESOLVE_MAP (&sym, version, r_type)))
         {
-         value = sym ? sym_map->l_addr + sym->st_value : 0;
-         value += reloc->r_addend;
+         value = sym_map->l_addr + sym->st_value + reloc->r_addend;
 
          if (R_IA64_TYPE (r_type) == R_IA64_TYPE (R_IA64_DIR64LSB))
            ;/* No adjustment.  */
@@ -571,6 +578,26 @@ elf_machine_rela (struct link_map *map,
            value = __ia64_make_fptr (sym_map, sym, value);
          else if (R_IA64_TYPE (r_type) == R_IA64_TYPE (R_IA64_PCREL64LSB))
            value -= (Elf64_Addr) reloc_addr & -16;
+#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || defined USE___THREAD)
+         else if (R_IA64_TYPE (r_type) == R_IA64_TYPE (R_IA64_DTPMOD64LSB))
+# ifdef RTLD_BOOTSTRAP
+           /* During startup the dynamic linker is always index 1.  */
+           value = 1;
+# else       
+           /* Get the information from the link map returned by the
+              resolv function.  */
+           value = sym_map->l_tls_modid;
+         else if (R_IA64_TYPE (r_type) == R_IA64_TYPE (R_IA64_DTPREL64LSB))
+           value -= sym_map->l_addr;
+# endif
+         else if (R_IA64_TYPE (r_type) == R_IA64_TYPE (R_IA64_TPREL64LSB))
+           {
+# ifndef RTLD_BOOTSTRAP
+             CHECK_STATIC_TLS (map, sym_map);
+# endif
+             value += sym_map->l_tls_offset - sym_map->l_addr;
+           }
+#endif
          else
            assert (! "unexpected dynamic reloc type");
        }