Update.

2002-12-20  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/dl-sysdep.c (_dl_important_hwcaps): For TLS
	builds add "tls" in the search path.
	* elf/ldconfig.c (is_hwcap_platform): Also recognize "tls".
	(path_hwcap): Recognize "tls".

	* sysdeps/unix/sysv/linux/i386/system.c (cancel_handler): Use
	__waitpid instead of waitpid.

1 files changed, 13 insertions, 1 deletions

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 7e813d46d4..1b501e66a6 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -158,6 +158,11 @@ is_hwcap_platform (const char *name)
   if (hwcap_idx != -1)
     return 1;
 
+#ifdef USE_TLS
+  if (strcmp (name, "tls") == 0)
+    return 1;
+#endif
+
   return 0;
 }
 
@@ -190,7 +195,14 @@ path_hwcap (const char *path)
 	{
 	  h = _dl_string_platform (ptr + 1);
 	  if (h == (uint64_t) -1)
-	    break;
+	    {
+#ifdef USE_TLS
+	      if (strcmp (ptr + 1, "tls") == 0)
+		h = 63;
+	      else
+#endif
+		break;
+	    }
 	}
       hwcap += 1ULL << h;