From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 11 Feb 2002 02:27:43 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2-3~1085
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7670e25ad5ac4e72b3fb63ea5e99159d30054d6f;p=thirdparty%2Fglibc.git

Update.

	* elf/do-lookup.h (FCT): st_value can be zero for STT_TLS symbols.
---

diff --git a/ChangeLog b/ChangeLog
index 950e8f98e0f..60b0ca271c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-02-10  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/do-lookup.h (FCT): st_value can be zero for STT_TLS symbols.
+
 	* po/fr.po: Update from translation team.
 
 	* elf/tls-macros.h: Add alternative macros for use in PIC.
diff --git a/elf/do-lookup.h b/elf/do-lookup.h
index cebc2ce300e..3e7290241bd 100644
--- a/elf/do-lookup.h
+++ b/elf/do-lookup.h
@@ -77,10 +77,12 @@ FCT (const char *undef_name, unsigned long int hash, const ElfW(Sym) *ref,
 	  sym = &symtab[symidx];
 
 	  assert (ELF_RTYPE_CLASS_PLT == 1);
-	  if (sym->st_value == 0 || /* No value.  */
-	      /* ((type_class & ELF_RTYPE_CLASS_PLT)
-		  && (sym->st_shndx == SHN_UNDEF)) */
-	      (type_class & (sym->st_shndx == SHN_UNDEF)))
+	  if ((sym->st_value == 0 /* No value.  */
+#ifdef USE_TLS
+	       && ELFW(ST_TYPE) (sym->st_info) != STT_TLS
+#endif
+	       )
+	      || (type_class & (sym->st_shndx == SHN_UNDEF)))
 	    continue;
 
 	  if (ELFW(ST_TYPE) (sym->st_info) > STT_FUNC