summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-09-13 10:20:44 +0200
committerAndreas Schwab <schwab@redhat.com>2011-09-13 10:21:47 +0200
commit995a80dfbcb443ead5aa22682c884ec5c827a2ea (patch)
tree5fb98da7846aacdbfa951a99333bbef06e04b009 /elf
parent8682f8b0e4bd3531e82d65332838421e76682956 (diff)
downloadglibc-995a80dfbcb443ead5aa22682c884ec5c827a2ea.tar.gz
glibc-995a80dfbcb443ead5aa22682c884ec5c827a2ea.tar.xz
glibc-995a80dfbcb443ead5aa22682c884ec5c827a2ea.zip
Only use USE___THREAD when defined
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index b3959a34d0..764140d3df 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -779,7 +779,12 @@ cannot allocate TLS data structures for initial thread");
 
   /* And finally install it for the main thread.  If ld.so itself uses
      TLS we know the thread pointer was initialized earlier.  */
-  const char *lossage = TLS_INIT_TP (tcbp, USE___THREAD);
+  const char *lossage
+#ifdef USE___THREAD
+    = TLS_INIT_TP (tcbp, USE___THREAD);
+#else
+    = TLS_INIT_TP (tcbp, 0);
+#endif
   if (__builtin_expect (lossage != NULL, 0))
     _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage);
   tls_init_tp_called = true;
@@ -2310,7 +2315,12 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
      TLS we know the thread pointer was initialized earlier.  */
   if (! tls_init_tp_called)
     {
-      const char *lossage = TLS_INIT_TP (tcbp, USE___THREAD);
+      const char *lossage
+#ifdef USE___THREAD
+	= TLS_INIT_TP (tcbp, USE___THREAD);
+#else
+	= TLS_INIT_TP (tcbp, 0);
+#endif
       if (__builtin_expect (lossage != NULL, 0))
 	_dl_fatal_printf ("cannot set up thread-local storage: %s\n",
 			  lossage);