about summary refs log tree commit diff
path: root/linuxthreads/tst-context.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-12-03 01:51:07 +0000
committerRoland McGrath <roland@gnu.org>2002-12-03 01:51:07 +0000
commit2d14868942150183adaf0bc80b8ed6b70b65261e (patch)
tree6f1aea1c1f443244ed6a0883ddf276c01232381d /linuxthreads/tst-context.c
parentf87277f2cdbfde84d4b82687a62e6eb8fd2222f9 (diff)
downloadglibc-2d14868942150183adaf0bc80b8ed6b70b65261e.tar.gz
glibc-2d14868942150183adaf0bc80b8ed6b70b65261e.tar.xz
glibc-2d14868942150183adaf0bc80b8ed6b70b65261e.zip
* elf/tst-tls4.c: Define an unused TLS variable here, so that no lazy
	TLS setup is required.
	* elf/tst-tls5.c: Likewise.
	* elf/tst-tls6.c: Likewise.
	* elf/tst-tls7.c: Likewise.
	* elf/tst-tls8.c: Likewise.
	* elf/tst-tls9.c: Likewise.

	* elf/rtld.c (dl_main): Remove [! SHARED] conditional from
	`if (GL(dl_tls_max_dtv_idx) > 0)' tests for doing TLS setup.
	* elf/dl-close.c (libc_freeres_fn): Check GL(dl_tls_dtv_slotinfo_list)
	for being null before calling free_slotinfo.
	* elf/dl-load.c (_dl_map_object_from_fd) [SHARED]: For PT_TLS in
	dynamic loading, bail with error if GL(dl_tls_max_dtv_idx) is zero.
Diffstat (limited to 'linuxthreads/tst-context.c')
-rw-r--r--linuxthreads/tst-context.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/linuxthreads/tst-context.c b/linuxthreads/tst-context.c
index 5c3272a4fb..2938a9f7fa 100644
--- a/linuxthreads/tst-context.c
+++ b/linuxthreads/tst-context.c
@@ -1,3 +1,12 @@
+/* Ack, a hack!  We need to get the proper definition, or lack thereof,
+   for FLOATING_STACKS.  But when !IS_IN_libpthread, this can get defined
+   incidentally by <tls.h>.  So kludge around it.  */
+
+#define IS_IN_libpthread
+#include <tls.h>
+#undef IS_IN_libpthread
+#undef USE___THREAD
+
 #include <errno.h>
 #include <error.h>
 #include <pthread.h>
@@ -5,8 +14,6 @@
 #include <stdlib.h>
 #include <ucontext.h>
 
-#include "pt-machine.h"
-
 
 #define N	4