about summary refs log tree commit diff
path: root/nptl/sysdeps/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-05-25 05:21:07 +0000
committerUlrich Drepper <drepper@redhat.com>2007-05-25 05:21:07 +0000
commit0a54ab53f2bbbd380b019dc665047fb3acf37e3a (patch)
treecb9ed7fadb5d0b66c121ac42ab2c1b62d67a6b2e /nptl/sysdeps/i386
parentddfd0535776c47ec01231ac91fabe8b2e128cfa3 (diff)
downloadglibc-0a54ab53f2bbbd380b019dc665047fb3acf37e3a.tar.gz
glibc-0a54ab53f2bbbd380b019dc665047fb3acf37e3a.tar.xz
glibc-0a54ab53f2bbbd380b019dc665047fb3acf37e3a.zip
* sysdeps/powerpc/tls.h (tcbhead_t): Add gscope_flag.
	(THREAD_GSCOPE_FLAG_UNUSED, THREAD_GSCOPE_FLAG_USED,
	THREAD_GSCOPE_FLAG_WAIT): Define.
	(THREAD_GSCOPE_GET_FLAG, THREAD_GSCOPE_SET_FLAG,
	THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_WAIT): Define.
	* sysdeps/i386/tls.h (THREAD_GSCOPE_WAIT): Don't use
	PTR_DEMANGLE.
	(THREAD_GSCOPE_GET_FLAG): Define.
	* sysdeps/x86_64/tls.h (THREAD_GSCOPE_GET_FLAG): Define.
	* allocatestack.c (__wait_lookup_done): Use THREAD_GSCOPE_GET_FLAG
	instead of ->header.gscope_flag directly.
Diffstat (limited to 'nptl/sysdeps/i386')
-rw-r--r--nptl/sysdeps/i386/tls.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
index 3bdf0f2b04..41e4327b4a 100644
--- a/nptl/sysdeps/i386/tls.h
+++ b/nptl/sysdeps/i386/tls.h
@@ -454,16 +454,9 @@ union user_desc_init
   while (0)
 #define THREAD_GSCOPE_SET_FLAG() \
   THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED)
-#ifdef PTR_DEMANGLE
-# define THREAD_GSCOPE_WAIT() \
-  do { void (*ptr) (void) = GL(dl_wait_lookup_done);			      \
-       PTR_DEMANGLE (ptr);						      \
-       ptr ();								      \
-  } while (0)
-#else
-# define THREAD_GSCOPE_WAIT() \
+#define THREAD_GSCOPE_GET_FLAG(descr) (descr)->header.gscope_flag
+#define THREAD_GSCOPE_WAIT() \
   GL(dl_wait_lookup_done) ()
-#endif
 
 
 #endif /* __ASSEMBLER__ */