From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 23 Nov 2004 22:57:42 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~17158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42586dce0327cd294aa28dc74a2d73eb1c10da88;p=external%2Fglibc.git

Update.

2004-11-23  Alexandre Oliva  <aoliva@redhat.com>

	* sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Use free
	range even if it doesn't match exactly.
---

diff --git a/ChangeLog b/ChangeLog
index 6d55477..7a8acee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-23  Alexandre Oliva  <aoliva@redhat.com>
+
+	* sysdeps/generic/dl-tls.c (_dl_determine_tlsoffset): Use free
+	range even if it doesn't match exactly.
+
 2004-11-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* nss/nss_files/files-XXX.c (internal_getent): If parse_line returned
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c
index bf3592e..3382e34 100644
--- a/sysdeps/generic/dl-tls.c
+++ b/sysdeps/generic/dl-tls.c
@@ -217,7 +217,7 @@ _dl_determine_tlsoffset (void)
       size_t off;
       max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align);
 
-      if (slotinfo[cnt].map->l_tls_blocksize >= freetop - freebottom)
+      if (slotinfo[cnt].map->l_tls_blocksize <= freetop - freebottom)
 	{
 	  off = roundup (freebottom, slotinfo[cnt].map->l_tls_align);
 	  if (off - freebottom < firstbyte)