diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-08-15 08:48:31 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-08-15 08:48:31 +0200 |
| commit | dda373b00e812d14ac7e228d117f9047ceee38c9 (patch) | |
| tree | 47fad5ff68bac62a5f761443adffea439fdea7ae /nptl | |
| parent | c54d86490300c29e00c20c8123388bd47f6fec76 (diff) | |
| download | glibc-dda373b00e812d14ac7e228d117f9047ceee38c9.tar glibc-dda373b00e812d14ac7e228d117f9047ceee38c9.tar.gz glibc-dda373b00e812d14ac7e228d117f9047ceee38c9.tar.bz2 glibc-dda373b00e812d14ac7e228d117f9047ceee38c9.zip | |
nptl: Move pthread_equal implementation into libc
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 4 | ||||
| -rw-r--r-- | nptl/forward.c | 4 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 0567e77a79..e66b115562 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -30,7 +30,7 @@ extra-libs-others := $(extra-libs) routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \ libc-cleanup libc_pthread_init libc_multiple_threads \ register-atfork pthread_atfork pthread_self thrd_current \ - thrd_equal thrd_sleep thrd_yield + thrd_equal thrd_sleep thrd_yield pthread_equal shared-only-routines = forward static-only-routines = pthread_atfork @@ -50,7 +50,7 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \ pthread_create pthread_exit pthread_detach \ pthread_join pthread_tryjoin pthread_timedjoin \ pthread_join_common \ - compat-pthread_self pthread_equal pthread_yield \ + compat-pthread_self pthread_yield \ pthread_getconcurrency pthread_setconcurrency \ pthread_getschedparam pthread_setschedparam \ pthread_setschedprio \ diff --git a/nptl/forward.c b/nptl/forward.c index ed1e7d0350..3ec9a46078 100644 --- a/nptl/forward.c +++ b/nptl/forward.c @@ -166,10 +166,6 @@ versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait, GLIBC_2_3_2); -FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2), - (thread1, thread2), 1) - - FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS)) strong_alias (__pthread_exit, pthread_exit); diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 73935f8be4..5734e21bd9 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -103,7 +103,6 @@ static const struct pthread_functions pthread_functions = .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0, .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0, # endif - .ptr_pthread_equal = __pthread_equal, .ptr___pthread_exit = __pthread_exit, .ptr_pthread_getschedparam = __pthread_getschedparam, .ptr_pthread_setschedparam = __pthread_setschedparam, |