From: Roland McGrath <roland@gnu.org>
Date: Thu, 12 Sep 2002 05:16:00 +0000 (+0000)
Subject: * elf/dl-load.c (_dl_map_object_from_fd): Use l_addr instead of
X-Git-Tag: upstream/2.30~21151
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb848e15854db60732536c0767ad529b6206311c;p=external%2Fglibc.git

* elf/dl-load.c (_dl_map_object_from_fd): Use l_addr instead of

	l_map_start to adjust l_tls_initimage.
---

diff --git a/ChangeLog b/ChangeLog
index 87c225b..687291b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-09-11  Roland McGrath  <roland@redhat.com>
 
+	* elf/dl-load.c (_dl_map_object_from_fd): Use l_addr instead of
+	l_map_start to adjust l_tls_initimage.
+
 	* nss/getnssent_r.c (__nss_getent_r): Use EAGAIN instead of errno
 	when using h_errno and it's not set to NETDB_INTERNAL.
 	* nss/getXXbyYY_r.c [NEED_H_ERRNO]: Likewise.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index e7747fa..1d10541 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1131,7 +1131,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
 #ifdef USE_TLS
     /* Adjust the address of the TLS initialization image.  */
     if (l->l_tls_initimage != NULL)
-      l->l_tls_initimage = (char *) l->l_tls_initimage + l->l_map_start;
+      l->l_tls_initimage = (char *) l->l_tls_initimage + l->l_addr;
 #endif
 
   /* We are done mapping in the file.  We no longer need the descriptor.  */
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 0208480..ca81cf4 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -242,8 +242,6 @@ done:
 #ifdef POSTPROCESS
   POSTPROCESS;
 #endif
-  return (status == NSS_STATUS_SUCCESS
-	  ? 0 : (status == NSS_STATUS_TRYAGAIN ? errno : ENOENT));
   return (status == NSS_STATUS_SUCCESS ? 0
 	  : status != NSS_STATUS_TRYAGAIN ? ENOENT
 #ifdef NEED_H_ERRNO