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

l_map_start to adjust l_tls_initimage.
This commit is contained in:
Roland McGrath 2002-09-12 05:16:00 +00:00
parent 9bfce4bf28
commit fb848e1585
3 changed files with 4 additions and 3 deletions

View File

@ -1,5 +1,8 @@
2002-09-11 Roland McGrath <roland@redhat.com> 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 * nss/getnssent_r.c (__nss_getent_r): Use EAGAIN instead of errno
when using h_errno and it's not set to NETDB_INTERNAL. when using h_errno and it's not set to NETDB_INTERNAL.
* nss/getXXbyYY_r.c [NEED_H_ERRNO]: Likewise. * nss/getXXbyYY_r.c [NEED_H_ERRNO]: Likewise.

View File

@ -1131,7 +1131,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
#ifdef USE_TLS #ifdef USE_TLS
/* Adjust the address of the TLS initialization image. */ /* Adjust the address of the TLS initialization image. */
if (l->l_tls_initimage != NULL) 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 #endif
/* We are done mapping in the file. We no longer need the descriptor. */ /* We are done mapping in the file. We no longer need the descriptor. */

View File

@ -242,8 +242,6 @@ done:
#ifdef POSTPROCESS #ifdef POSTPROCESS
POSTPROCESS; POSTPROCESS;
#endif #endif
return (status == NSS_STATUS_SUCCESS
? 0 : (status == NSS_STATUS_TRYAGAIN ? errno : ENOENT));
return (status == NSS_STATUS_SUCCESS ? 0 return (status == NSS_STATUS_SUCCESS ? 0
: status != NSS_STATUS_TRYAGAIN ? ENOENT : status != NSS_STATUS_TRYAGAIN ? ENOENT
#ifdef NEED_H_ERRNO #ifdef NEED_H_ERRNO