AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-26 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only use USE___THREAD when defined

Browse Source
This commit is contained in:
Andreas Schwab 2011-09-13 10:20:44 +02:00
parent 8682f8b0e4
commit 995a80dfbc
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-09-13 Andreas Schwab <schwab@redhat.com>
* elf/rtld.c (dl_main): Only use USE___THREAD when defined.
(init_tls): Likewise.
2011-09-12 Ulrich Drepper <drepper@gmail.com> 2011-09-12 Ulrich Drepper <drepper@gmail.com>
* sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c: New file. * sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c: New file.

14
elf/rtld.c
View File

@ -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 /* And finally install it for the main thread. If ld.so itself uses
TLS we know the thread pointer was initialized earlier. */ 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)) if (__builtin_expect (lossage != NULL, 0))
_dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage);
tls_init_tp_called = true; 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. */ TLS we know the thread pointer was initialized earlier. */
if (! tls_init_tp_called) 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)) if (__builtin_expect (lossage != NULL, 0))
_dl_fatal_printf ("cannot set up thread-local storage: %s\n", _dl_fatal_printf ("cannot set up thread-local storage: %s\n",
lossage); lossage);