diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-21 22:35:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-21 22:35:01 +0200 |
| commit | 49e182c7376b0fa30c18d0b7003a8e84624494c0 (patch) | |
| tree | 0072f8841d2e08f644a7f69659773425054df997 /nptl/libpthread-compat.c | |
| parent | f47f1d91af985a9028fb399da21eab460d887a15 (diff) | |
| download | glibc-49e182c7376b0fa30c18d0b7003a8e84624494c0.tar.gz glibc-49e182c7376b0fa30c18d0b7003a8e84624494c0.tar.xz glibc-49e182c7376b0fa30c18d0b7003a8e84624494c0.zip | |
nptl: Remove remaining code from libpthread
Only the placeholder compatibility symbols are left now. The __errno_location symbol was removed (moved) using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/libpthread-compat.c')
| -rw-r--r-- | nptl/libpthread-compat.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c index 2dcf175f3f..fb336d0685 100644 --- a/nptl/libpthread-compat.c +++ b/nptl/libpthread-compat.c @@ -28,6 +28,11 @@ __libpthread_version_placeholder_1 (void) } #endif +#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) +compat_symbol (libpthread, __libpthread_version_placeholder_1, + __libpthread_version_placeholder, GLIBC_2_0); +#endif + #if (SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_2)) compat_symbol (libpthread, __libpthread_version_placeholder_1, __libpthread_version_placeholder, GLIBC_2_1); @@ -42,7 +47,7 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1, __libpthread_version_placeholder, GLIBC_2_1_2); #endif -#if SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_2_3) \ +#if SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_3) \ && ABI_libpthread_GLIBC_2_2 != ABI_libpthread_GLIBC_2_0 compat_symbol (libpthread, __libpthread_version_placeholder_1, __libpthread_version_placeholder, GLIBC_2_2); @@ -88,8 +93,7 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1, __libpthread_version_placeholder, GLIBC_2_12); #endif -#if SHLIB_COMPAT (libpthread, GLIBC_2_18, GLIBC_2_19) \ - && ABI_libpthread_GLIBC_2_18 != ABI_libpthread_GLIBC_2_0 +#if SHLIB_COMPAT (libpthread, GLIBC_2_18, GLIBC_2_19) compat_symbol (libpthread, __libpthread_version_placeholder_1, __libpthread_version_placeholder, GLIBC_2_18); #endif |