* Compile fix for --without-tls
@ 2005-01-09 16:35 Andreas Schwab
0 siblings, 0 replies; only message in thread
From: Andreas Schwab @ 2005-01-09 16:35 UTC (permalink / raw)
To: libc-hacker
2005-01-09 Andreas Schwab <schwab@suse.de>
* elf/rtld.c (dl_main): Call _dl_add_to_slotinfo only if USE_TLS.
Index: elf/rtld.c
===================================================================
RCS file: /cvs/glibc/libc/elf/rtld.c,v
retrieving revision 1.343
diff -u -a -p -a -u -p -r1.343 elf/rtld.c
--- elf/rtld.c 9 Jan 2005 08:26:07 -0000 1.343
+++ elf/rtld.c 9 Jan 2005 16:33:44 -0000
@@ -2117,9 +2117,11 @@ ERROR: ld.so: object '%s' from %s cannot
if (l->l_relro_size)
_dl_protect_relro (l);
+#ifdef USE_TLS
/* Add object to slot information data if necessasy. */
if (l->l_tls_blocksize != 0 && tls_init_tp_called)
_dl_add_to_slotinfo (l);
+#endif
}
_dl_sysdep_start_cleanup ();
@@ -2167,9 +2169,11 @@ ERROR: ld.so: object '%s' from %s cannot
_dl_relocate_object (l, l->l_scope, GLRO(dl_lazy),
consider_profiling);
+#ifdef USE_TLS
/* Add object to slot information data if necessasy. */
if (l->l_tls_blocksize != 0 && tls_init_tp_called)
_dl_add_to_slotinfo (l);
+#endif
l = l->l_prev;
}
Andreas.
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-01-09 16:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-09 16:35 Compile fix for --without-tls Andreas Schwab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).