diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-09-17 16:38:54 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-09-17 16:38:54 -0700 |
| commit | e5d19c08d12880edbdf8772c8fb1f747c71d866e (patch) | |
| tree | 92bf00b39e906a7b60b259758a91b675085a1a62 /nptl | |
| parent | 61f893789862db1dfdf188f77cd215bab0814d2c (diff) | |
| download | glibc-e5d19c08d12880edbdf8772c8fb1f747c71d866e.tar.gz glibc-e5d19c08d12880edbdf8772c8fb1f747c71d866e.tar.xz glibc-e5d19c08d12880edbdf8772c8fb1f747c71d866e.zip | |
Use __pthread_setcancelstate in libc.a
This patch references __pthread_setcancelstate instead of pthread_setcancelstate in libc.a. [BZ #18970] * misc/error.c (error): Replace pthread_setcancelstate with __pthread_setcancelstate. (error_at_line): Likewise. * posix/wordexp.c (parse_comm): Likewise. * stdlib/fmtmsg.c (fmtmsg): Likewise. * nptl/forward.c (pthread_setcancelstate): Renamed to ... (__pthread_setcancelstate): This. (pthread_setcancelstate): Add an alias. * nptl/nptl-init.c (pthread_functions): Replace ptr_pthread_setcancelstate with ptr___pthread_setcancelstate. * sysdeps/nptl/pthread-functions.h (pthread_functions): Likewise. * nptl/pthreadP.h (__pthread_setcancelstate): Mark it with hidden_proto. * nptl/pthread_setcancelstate.c (__pthread_setcancelstate): Mark it with hidden_def. * sysdeps/nptl/libc-lockP.h (__pthread_setcancelstate): New. (pthread_setcancelstate): Renamed to ... (__pthread_setcancelstate): This. * sysdeps/unix/sysv/linux/fatal-prepare.h (FATAL_PREPARE): Use __libc_ptf_call with __pthread_setcancelstate.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/forward.c | 5 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 2 | ||||
| -rw-r--r-- | nptl/pthreadP.h | 1 | ||||
| -rw-r--r-- | nptl/pthread_setcancelstate.c | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/nptl/forward.c b/nptl/forward.c index db74f8df92..57a12a427b 100644 --- a/nptl/forward.c +++ b/nptl/forward.c @@ -197,8 +197,9 @@ FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) FORWARD2 (pthread_self, pthread_t, (void), (), return 0) -FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), - 0) +FORWARD (__pthread_setcancelstate, (int state, int *oldstate), + (state, oldstate), 0) +strong_alias (__pthread_setcancelstate, pthread_setcancelstate) FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index c043fb50ab..79bcaab19d 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -127,7 +127,7 @@ static const struct pthread_functions pthread_functions = .ptr_pthread_mutex_lock = __pthread_mutex_lock, .ptr_pthread_mutex_unlock = __pthread_mutex_unlock, .ptr_pthread_self = __pthread_self, - .ptr_pthread_setcancelstate = __pthread_setcancelstate, + .ptr___pthread_setcancelstate = __pthread_setcancelstate, .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_cleanup_upto = __pthread_cleanup_upto, .ptr___pthread_once = __pthread_once, diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 8cd51c65ad..b96be56493 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -504,6 +504,7 @@ hidden_proto (__pthread_key_create) hidden_proto (__pthread_getspecific) hidden_proto (__pthread_setspecific) hidden_proto (__pthread_once) +hidden_proto (__pthread_setcancelstate) #endif extern int __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond); diff --git a/nptl/pthread_setcancelstate.c b/nptl/pthread_setcancelstate.c index 1807789caa..c8bc8b883c 100644 --- a/nptl/pthread_setcancelstate.c +++ b/nptl/pthread_setcancelstate.c @@ -70,3 +70,4 @@ __pthread_setcancelstate (state, oldstate) return 0; } strong_alias (__pthread_setcancelstate, pthread_setcancelstate) +hidden_def (__pthread_setcancelstate) |