From 7cea6212785552b73f22af110a71aa77e2333b82 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 20 May 2015 14:52:05 -0700 Subject: NaCl: Set tid field to a unique value. --- nptl/nptl-init.c | 6 ++---- nptl/pthread-pids.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 nptl/pthread-pids.h (limited to 'nptl') diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 1ad41c5bb3..5b8d931697 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -36,6 +36,7 @@ #include #include #include +#include #ifndef TLS_MULTIPLE_THREADS_IN_TCB /* Pointer to the corresponding variable in libc. */ @@ -311,10 +312,7 @@ __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 + __pthread_initialize_pids (pd); THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]); THREAD_SETMEM (pd, user_stack, true); if (LLL_LOCK_INITIALIZER != 0) diff --git a/nptl/pthread-pids.h b/nptl/pthread-pids.h new file mode 100644 index 0000000000..33d764cf82 --- /dev/null +++ b/nptl/pthread-pids.h @@ -0,0 +1,29 @@ +/* Initialize pid and tid fields of struct pthread. Stub version. + Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +/* Initialize PD->pid and PD->tid for the initial thread. If there is + setup required to arrange that __exit_thread causes PD->tid to be + cleared and futex-woken, then this function should do that as well. */ +static inline void +__pthread_initialize_pids (struct pthread *pd) +{ +#error "sysdeps pthread-pids.h file required" + pd->pid = pd->tid = -1; +} -- cgit 1.4.1