Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* elf/dl-load.c (_dl_map_object_from_fd): If loaded object uses
	TLS fail is USE_TLS is not defined.
  • Loading branch information
Ulrich Drepper committed Jul 16, 2002
1 parent 706d1de commit 807bce8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2002-07-15 Ulrich Drepper <drepper@redhat.com>

* elf/dl-load.c (_dl_map_object_from_fd): If loaded object uses
TLS fail is USE_TLS is not defined.

* libio/wfileops.c (_IO_wfile_seekoff): Reposition wide pointers
and adjust state for seek position. [PR libc/4070]
* libio/Makefile (tests): Add bug-rewind.
Expand Down
8 changes: 6 additions & 2 deletions elf/dl-load.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,8 +940,8 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
}
break;

#ifdef USE_TLS
case PT_TLS:
#ifdef USE_TLS
if (ph->p_memsz > 0)
{
l->l_tls_blocksize = ph->p_memsz;
Expand All @@ -954,8 +954,12 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
/* Assign the next available module ID. */
l->l_tls_modid = _dl_next_tls_modid ();
}
break;
#else
/* Uh-oh, the binary expects TLS support but we cannot
provide it. */
_dl_fatal_printf ("cannot handle file '%s' with TLS data", name);
#endif
break;
}

/* Now process the load commands and map segments into memory. */
Expand Down

0 comments on commit 807bce8

Please sign in to comment.