aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-03-15 11:02:21 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-03-18 15:54:39 -0300
commitd5ddd583da7ee8928eebfa1d7eee69b557deec9c (patch)
tree887907ea3861331aebc5fc91a6ba84c062e0a2f7 /nptl
parent9cf242997d17e679e9ff4f09754b739994a06430 (diff)
downloadglibc-d5ddd583da7ee8928eebfa1d7eee69b557deec9c.zip
glibc-d5ddd583da7ee8928eebfa1d7eee69b557deec9c.tar.gz
glibc-d5ddd583da7ee8928eebfa1d7eee69b557deec9c.tar.bz2
nptl: Move system to libc
The libc version is identical and built with same flags. Checked on x86_64-linux-gnu.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile3
-rw-r--r--nptl/Versions1
-rw-r--r--nptl/pt-system.c45
3 files changed, 0 insertions, 49 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 9befd09..d370440 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -114,7 +114,6 @@ libpthread-routines = \
pt-interp \
pt-longjmp \
pt-raise \
- pt-system \
pthread_attr_getaffinity \
pthread_attr_getguardsize \
pthread_attr_getstack \
@@ -296,8 +295,6 @@ CFLAGS-send.c += -fexceptions -fasynchronous-unwind-tables
CFLAGS-sigsuspend.c += -fexceptions -fasynchronous-unwind-tables
CFLAGS-fdatasync.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-pt-system.c += -fexceptions
-
CFLAGS-futex-internal.c += -fexceptions -fasynchronous-unwind-tables
LDLIBS-tst-once5 = -lstdc++
diff --git a/nptl/Versions b/nptl/Versions
index 58d1ff2..be7a8e6 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -173,7 +173,6 @@ libpthread {
send;
sigaction;
siglongjmp;
- system;
}
GLIBC_2.1 {
diff --git a/nptl/pt-system.c b/nptl/pt-system.c
deleted file mode 100644
index 29d4b85..0000000
--- a/nptl/pt-system.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ABI compatibility for 'system' symbol in libpthread ABI.
- Copyright (C) 2002-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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
- <https://www.gnu.org/licenses/>. */
-
-#include <stdlib.h>
-#include <shlib-compat.h>
-
-/* libpthread once had its own 'system', though there was no apparent
- reason for it. There is no use in having a separate symbol in
- libpthread, but the historical ABI requires it. For static linking,
- there is no need to provide anything here--the libc version will be
- linked in. For shared library ABI compatibility, there must be a
- 'system' symbol in libpthread.so.
-
- With an IFUNC resolver, it would be possible to avoid the indirection,
- but the IFUNC resolver might run before the __libc_system symbol has
- been relocated, in which case the IFUNC resolver would not be able to
- provide the correct address. */
-
-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
-
-static int __attribute__ ((used))
-system_compat (const char *line)
-{
- return __libc_system (line);
-}
-strong_alias (system_compat, system_alias)
-compat_symbol (libpthread, system_alias, system, GLIBC_2_0);
-
-#endif