diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-10-17 15:03:00 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-10-17 15:03:00 -0700 |
| commit | 674b89786e04a4addc79d70e025848f1e0116a41 (patch) | |
| tree | f74ab3ca737fbdf509e9cb02dac99bddda136f30 /nptl | |
| parent | 184ee94010786a9e0952aff3af39eba1d72287d3 (diff) | |
| download | glibc-674b89786e04a4addc79d70e025848f1e0116a41.zip glibc-674b89786e04a4addc79d70e025848f1e0116a41.tar.gz glibc-674b89786e04a4addc79d70e025848f1e0116a41.tar.bz2 | |
NPTL: Clean up THREAD_SYSINFO macros.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/allocatestack.c | 6 | ||||
| -rw-r--r-- | nptl/createthread.c | 2 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index b19d9b3..8cf0274 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -430,8 +430,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, #endif #ifdef NEED_DL_SYSINFO - /* Copy the sysinfo value from the parent. */ - THREAD_SYSINFO(pd) = THREAD_SELF_SYSINFO; + SETUP_THREAD_SYSINFO (pd); #endif /* The process ID is also the same as that of the caller. */ @@ -567,8 +566,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, #endif #ifdef NEED_DL_SYSINFO - /* Copy the sysinfo value from the parent. */ - THREAD_SYSINFO(pd) = THREAD_SELF_SYSINFO; + SETUP_THREAD_SYSINFO (pd); #endif /* Don't allow setxid until cloned. */ diff --git a/nptl/createthread.c b/nptl/createthread.c index e718e35..9eaf2ce 100644 --- a/nptl/createthread.c +++ b/nptl/createthread.c @@ -234,7 +234,7 @@ create_thread (struct pthread *pd, const struct pthread_attr *attr, } #ifdef NEED_DL_SYSINFO - assert (THREAD_SELF_SYSINFO == THREAD_SYSINFO (pd)); + CHECK_THREAD_SYSINFO (pd); #endif /* Determine whether the newly created threads has to be started diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index a39ec9a..b7d2197 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -304,8 +304,10 @@ __pthread_initialize_minimal_internal (void) /* Minimal initialization of the thread descriptor. */ struct pthread *pd = THREAD_SELF; +#ifdef __NR_set_tid_address INTERNAL_SYSCALL_DECL (err); pd->pid = pd->tid = INTERNAL_SYSCALL (set_tid_address, err, 1, &pd->tid); +#endif THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]); THREAD_SETMEM (pd, user_stack, true); if (LLL_LOCK_INITIALIZER != 0) |