From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 29 Oct 2006 21:48:06 +0000 (+0000)
Subject: (RTLD_SINGLE_THREAD_P): Define.
X-Git-Tag: glibc-2.16-ports-before-merge~815
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf0494f3e7841fcbd4a996a2bacdce71fa62ca3e;p=thirdparty%2Fglibc.git

(RTLD_SINGLE_THREAD_P): Define.
(SINGLE_THREAD_P): Define to 1 if IS_IN_rtld.
---

diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
index 7e61d685738..aa42768f70a 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
@@ -163,13 +163,13 @@ extern int __local_multiple_threads attribute_hidden;
 
 #else
 
-# ifdef IS_IN_rtld
-#  define SINGLE_THREAD_P \
-  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
-				   header.multiple_threads) == 0, 1)
-# else
-#  define SINGLE_THREAD_P (1)
-# endif
+# define SINGLE_THREAD_P (1)
 # define NO_CANCELLATION 1
 
 #endif
+
+#ifndef __ASSEMBLER__
+# define RTLD_SINGLE_THREAD_P \
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
+				   header.multiple_threads) == 0, 1)
+#endif