aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-08-15 11:02:21 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-08-15 14:33:49 +0200
commit17e1347452df722eed69b8b756ae21c35933b4b5 (patch)
tree3b9a05ec4c3a39495be0dd5ed8cd2aaa5e30ce97 /nptl
parentfa57c3019320bb771cfbbc099e3ca31eb4696ad3 (diff)
downloadglibc-17e1347452df722eed69b8b756ae21c35933b4b5.zip
glibc-17e1347452df722eed69b8b756ae21c35933b4b5.tar.gz
glibc-17e1347452df722eed69b8b756ae21c35933b4b5.tar.bz2
nptl: Remove pthread_self compatibility symbol from libpthread
The symbol is no longer needed because since glibc 2.30, the dynamic loader continues searching for the symbol in libc.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile3
-rw-r--r--nptl/Versions2
-rw-r--r--nptl/compat-pthread_self.c27
3 files changed, 2 insertions, 30 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index a643306..df47bba 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -50,8 +50,7 @@ pthread-compat-wrappers = \
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_yield \
+ pthread_join_common pthread_yield \
pthread_getconcurrency pthread_setconcurrency \
pthread_getschedparam pthread_setschedparam \
pthread_setschedprio \
diff --git a/nptl/Versions b/nptl/Versions
index 50d6717..3aea423 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -44,7 +44,7 @@ libc {
libpthread {
GLIBC_2.0 {
- pthread_create; pthread_join; pthread_self; pthread_equal;
+ pthread_create; pthread_join;
pthread_exit; pthread_detach;
pthread_getschedparam; pthread_setschedparam;
diff --git a/nptl/compat-pthread_self.c b/nptl/compat-pthread_self.c
deleted file mode 100644
index 2ccf99d..0000000
--- a/nptl/compat-pthread_self.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Compatibility version of pthread_self in libpthread.
- Copyright (C) 2017-2019 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
- <http://www.gnu.org/licenses/>. */
-
-/* Compatibility version of pthread_self for old binaries which link
- directly against libpthread's version. */
-
-#include <shlib-compat.h>
-
-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_27)
-# include "pthread_self.c"
-compat_symbol (libpthread, pthread_self, pthread_self, GLIBC_2_0);
-#endif