Update.

	* elf/dl-lookup.c: Include <tls.h>.
	* elf/do-lookup.h (FCT): Don't discard STT_TLS symbols.

diff --git a/ChangeLog b/ChangeLog
index 695a525be67326a78b136a1952616e148f17be9b..9187c28ef8acbcf11a5a5b080ebef3d8b8444ea4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-10  Ulrich Drepper  <drepper@redhat.com>
 
+       * elf/dl-lookup.c: Include <tls.h>.
+       * elf/do-lookup.h (FCT): Don't discard STT_TLS symbols.
+
        * sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): More changes
        required by passing pointer to last element of the list.
 

diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 8de301eaa8d31b4e084c38d032e1de2c2d1d5723..521f032b2bc03c60966a079a470e3f86408c2e7c 100644 (file)
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -26,6 +26,7 @@
 #include "dl-hash.h"
 #include <dl-machine.h>
 #include <bits/libc-lock.h>
+#include <tls.h>
 
 #include <assert.h>
 

diff --git a/elf/do-lookup.h b/elf/do-lookup.h
index c316159fe1ba7a04b431f88b119b1ae343ecc9ee..cebc2ce300ebdf183826a744d418b6d7cd365887 100644 (file)
--- a/elf/do-lookup.h
+++ b/elf/do-lookup.h
@@ -83,9 +83,14 @@ FCT (const char *undef_name, unsigned long int hash, const ElfW(Sym) *ref,
              (type_class & (sym->st_shndx == SHN_UNDEF)))
            continue;
 
-         if (ELFW(ST_TYPE) (sym->st_info) > STT_FUNC)
-           /* Ignore all but STT_NOTYPE, STT_OBJECT and STT_FUNC entries
-              since these are no code/data definitions.  */
+         if (ELFW(ST_TYPE) (sym->st_info) > STT_FUNC
+#ifdef USE_TLS
+             && ELFW(ST_TYPE) (sym->st_info) != STT_TLS
+#endif
+             )
+           /* Ignore all but STT_NOTYPE, STT_OBJECT and STT_FUNC
+              entries (and STT_TLS if TLS is supported) since these
+              are no code/data definitions.  */
            continue;
 
          if (sym != ref && strcmp (strtab + sym->st_name, undef_name))