* [PATCH 1/2] nptl: Remove __res_state from libpthread
2021-04-23 12:58 [PATCH 0/2] Resolver-related libpthread cleanups Florian Weimer
@ 2021-04-23 12:58 ` Florian Weimer
2021-04-23 12:58 ` [PATCH 2/2] nptl: Remove __h_errno_location " Florian Weimer
2021-04-23 16:48 ` [PATCH 0/2] Resolver-related libpthread cleanups H.J. Lu
2 siblings, 0 replies; 4+ messages in thread
From: Florian Weimer @ 2021-04-23 12:58 UTC (permalink / raw)
To: libc-alpha
The existing definition in libc will be used instead.
The symbol was moved (that is, removed) using
scripts/move-symbol-to-libc.py.
---
nptl/Makefile | 1 -
nptl/Versions | 1 -
nptl/res.c | 26 -------------------
.../sysv/linux/aarch64/libpthread.abilist | 1 -
.../unix/sysv/linux/alpha/libpthread.abilist | 1 -
.../unix/sysv/linux/arc/libpthread.abilist | 1 -
.../unix/sysv/linux/arm/be/libpthread.abilist | 1 -
.../unix/sysv/linux/arm/le/libpthread.abilist | 1 -
.../unix/sysv/linux/csky/libpthread.abilist | 1 -
.../unix/sysv/linux/hppa/libpthread.abilist | 1 -
.../unix/sysv/linux/i386/libpthread.abilist | 1 -
.../unix/sysv/linux/ia64/libpthread.abilist | 1 -
.../linux/m68k/coldfire/libpthread.abilist | 1 -
.../sysv/linux/m68k/m680x0/libpthread.abilist | 1 -
.../linux/microblaze/be/libpthread.abilist | 1 -
.../linux/microblaze/le/libpthread.abilist | 1 -
.../sysv/linux/mips/mips32/libpthread.abilist | 1 -
.../sysv/linux/mips/mips64/libpthread.abilist | 1 -
.../unix/sysv/linux/nios2/libpthread.abilist | 1 -
.../powerpc/powerpc32/libpthread.abilist | 1 -
.../powerpc/powerpc64/be/libpthread.abilist | 1 -
.../powerpc/powerpc64/le/libpthread.abilist | 1 -
.../sysv/linux/riscv/rv32/libpthread.abilist | 1 -
.../sysv/linux/riscv/rv64/libpthread.abilist | 1 -
.../linux/s390/s390-32/libpthread.abilist | 1 -
.../linux/s390/s390-64/libpthread.abilist | 1 -
.../unix/sysv/linux/sh/be/libpthread.abilist | 1 -
.../unix/sysv/linux/sh/le/libpthread.abilist | 1 -
.../linux/sparc/sparc32/libpthread.abilist | 1 -
.../linux/sparc/sparc64/libpthread.abilist | 1 -
.../sysv/linux/x86_64/64/libpthread.abilist | 1 -
.../sysv/linux/x86_64/x32/libpthread.abilist | 1 -
32 files changed, 57 deletions(-)
delete mode 100644 nptl/res.c
diff --git a/nptl/Makefile b/nptl/Makefile
index 99a54ff975..f0fc49e414 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -203,7 +203,6 @@ libpthread-routines = \
pthread_timedjoin \
pthread_tryjoin \
pthread_yield \
- res \
sem_clockwait \
sem_close \
sem_destroy \
diff --git a/nptl/Versions b/nptl/Versions
index 87412e674a..fffa58433b 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -290,7 +290,6 @@ libpthread {
__pthread_rwlock_init;
__pthread_rwlock_tryrdlock;
__pthread_rwlock_trywrlock;
- __res_state;
pthread_attr_getstack;
pthread_attr_setstack;
pthread_barrier_destroy;
diff --git a/nptl/res.c b/nptl/res.c
deleted file mode 100644
index 24b711d080..0000000000
--- a/nptl/res.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 2002-2021 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
- <https://www.gnu.org/licenses/>. */
-
-#include <features.h>
-#include <resolv.h>
-#include <tls.h>
-
-struct __res_state *
-__res_state (void)
-{
- return __resp;
-}
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 67ddfcd72e..b18443c947 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.17 __pthread_rwlock_tryrdlock F
GLIBC_2.17 __pthread_rwlock_trywrlock F
GLIBC_2.17 __pthread_unregister_cancel F
GLIBC_2.17 __pthread_unregister_cancel_restore F
-GLIBC_2.17 __res_state F
GLIBC_2.17 flockfile F
GLIBC_2.17 ftrylockfile F
GLIBC_2.17 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index ad49b0fdb5..babe029000 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -55,7 +55,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_setstack F
GLIBC_2.2 pthread_barrier_destroy F
diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
index 8967888b32..9742e49d79 100644
--- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.32 __pthread_rwlock_tryrdlock F
GLIBC_2.32 __pthread_rwlock_trywrlock F
GLIBC_2.32 __pthread_unregister_cancel F
GLIBC_2.32 __pthread_unregister_cancel_restore F
-GLIBC_2.32 __res_state F
GLIBC_2.32 call_once F
GLIBC_2.32 cnd_broadcast F
GLIBC_2.32 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 81bbc56cc4..ab706f1737 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -42,7 +42,6 @@ GLIBC_2.4 __pthread_rwlock_tryrdlock F
GLIBC_2.4 __pthread_rwlock_trywrlock F
GLIBC_2.4 __pthread_unregister_cancel F
GLIBC_2.4 __pthread_unregister_cancel_restore F
-GLIBC_2.4 __res_state F
GLIBC_2.4 flockfile F
GLIBC_2.4 ftrylockfile F
GLIBC_2.4 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 81bbc56cc4..ab706f1737 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -42,7 +42,6 @@ GLIBC_2.4 __pthread_rwlock_tryrdlock F
GLIBC_2.4 __pthread_rwlock_trywrlock F
GLIBC_2.4 __pthread_unregister_cancel F
GLIBC_2.4 __pthread_unregister_cancel_restore F
-GLIBC_2.4 __res_state F
GLIBC_2.4 flockfile F
GLIBC_2.4 ftrylockfile F
GLIBC_2.4 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 48c1d3aa89..9040867c17 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.29 __pthread_rwlock_tryrdlock F
GLIBC_2.29 __pthread_rwlock_trywrlock F
GLIBC_2.29 __pthread_unregister_cancel F
GLIBC_2.29 __pthread_unregister_cancel_restore F
-GLIBC_2.29 __res_state F
GLIBC_2.29 call_once F
GLIBC_2.29 cnd_broadcast F
GLIBC_2.29 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index e36c12c5e1..0ecdb5e0c8 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -12,7 +12,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 flockfile F
GLIBC_2.2 ftrylockfile F
GLIBC_2.2 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index de04ed6609..5dc867dc7a 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -55,7 +55,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_setstack F
GLIBC_2.2 pthread_barrier_destroy F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index fa70e3e166..53d4365de5 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -12,7 +12,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 flockfile F
GLIBC_2.2 ftrylockfile F
GLIBC_2.2 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 81bbc56cc4..ab706f1737 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -42,7 +42,6 @@ GLIBC_2.4 __pthread_rwlock_tryrdlock F
GLIBC_2.4 __pthread_rwlock_trywrlock F
GLIBC_2.4 __pthread_unregister_cancel F
GLIBC_2.4 __pthread_unregister_cancel_restore F
-GLIBC_2.4 __res_state F
GLIBC_2.4 flockfile F
GLIBC_2.4 ftrylockfile F
GLIBC_2.4 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index de04ed6609..5dc867dc7a 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -55,7 +55,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_setstack F
GLIBC_2.2 pthread_barrier_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index f7a78a8540..9749474c50 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.18 __pthread_rwlock_tryrdlock F
GLIBC_2.18 __pthread_rwlock_trywrlock F
GLIBC_2.18 __pthread_unregister_cancel F
GLIBC_2.18 __pthread_unregister_cancel_restore F
-GLIBC_2.18 __res_state F
GLIBC_2.18 flockfile F
GLIBC_2.18 ftrylockfile F
GLIBC_2.18 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index f7a78a8540..9749474c50 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.18 __pthread_rwlock_tryrdlock F
GLIBC_2.18 __pthread_rwlock_trywrlock F
GLIBC_2.18 __pthread_unregister_cancel F
GLIBC_2.18 __pthread_unregister_cancel_restore F
-GLIBC_2.18 __res_state F
GLIBC_2.18 flockfile F
GLIBC_2.18 ftrylockfile F
GLIBC_2.18 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index d18832f6c5..f970121f80 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -26,7 +26,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getguardsize F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index d18832f6c5..f970121f80 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -26,7 +26,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getguardsize F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_getstackaddr F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 37959f5d3d..ec932a5282 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.21 __pthread_rwlock_tryrdlock F
GLIBC_2.21 __pthread_rwlock_trywrlock F
GLIBC_2.21 __pthread_unregister_cancel F
GLIBC_2.21 __pthread_unregister_cancel_restore F
-GLIBC_2.21 __res_state F
GLIBC_2.21 flockfile F
GLIBC_2.21 ftrylockfile F
GLIBC_2.21 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 8f2d6eb8c5..82c787c002 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -55,7 +55,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_setstack F
GLIBC_2.2 pthread_barrier_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 7accad51b9..e7a8bfb956 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -33,7 +33,6 @@ GLIBC_2.3 __pthread_rwlock_destroy F
GLIBC_2.3 __pthread_rwlock_init F
GLIBC_2.3 __pthread_rwlock_tryrdlock F
GLIBC_2.3 __pthread_rwlock_trywrlock F
-GLIBC_2.3 __res_state F
GLIBC_2.3 flockfile F
GLIBC_2.3 ftrylockfile F
GLIBC_2.3 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 67ddfcd72e..b18443c947 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.17 __pthread_rwlock_tryrdlock F
GLIBC_2.17 __pthread_rwlock_trywrlock F
GLIBC_2.17 __pthread_unregister_cancel F
GLIBC_2.17 __pthread_unregister_cancel_restore F
-GLIBC_2.17 __res_state F
GLIBC_2.17 flockfile F
GLIBC_2.17 ftrylockfile F
GLIBC_2.17 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
index 384988b8c7..0da414634f 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.33 __pthread_rwlock_tryrdlock F
GLIBC_2.33 __pthread_rwlock_trywrlock F
GLIBC_2.33 __pthread_unregister_cancel F
GLIBC_2.33 __pthread_unregister_cancel_restore F
-GLIBC_2.33 __res_state F
GLIBC_2.33 call_once F
GLIBC_2.33 cnd_broadcast F
GLIBC_2.33 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 70f1d5d774..0bf079090e 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.27 __pthread_rwlock_tryrdlock F
GLIBC_2.27 __pthread_rwlock_trywrlock F
GLIBC_2.27 __pthread_unregister_cancel F
GLIBC_2.27 __pthread_unregister_cancel_restore F
-GLIBC_2.27 __res_state F
GLIBC_2.27 flockfile F
GLIBC_2.27 ftrylockfile F
GLIBC_2.27 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 2d87e9fa8e..1cd1d570ed 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -56,7 +56,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_setstack F
GLIBC_2.2 pthread_barrier_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index a5c601d8ee..2b212017c7 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -13,7 +13,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 flockfile F
GLIBC_2.2 ftrylockfile F
GLIBC_2.2 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index e36c12c5e1..0ecdb5e0c8 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -12,7 +12,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 flockfile F
GLIBC_2.2 ftrylockfile F
GLIBC_2.2 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index e36c12c5e1..0ecdb5e0c8 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -12,7 +12,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 flockfile F
GLIBC_2.2 ftrylockfile F
GLIBC_2.2 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index ad49b0fdb5..babe029000 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -55,7 +55,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 pthread_attr_getstack F
GLIBC_2.2 pthread_attr_setstack F
GLIBC_2.2 pthread_barrier_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index fa70e3e166..53d4365de5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -12,7 +12,6 @@ GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
GLIBC_2.2 __pthread_rwlock_trywrlock F
-GLIBC_2.2 __res_state F
GLIBC_2.2 flockfile F
GLIBC_2.2 ftrylockfile F
GLIBC_2.2 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 2d1a5eaeb2..985a6b5035 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -12,7 +12,6 @@ GLIBC_2.2.5 __pthread_rwlock_destroy F
GLIBC_2.2.5 __pthread_rwlock_init F
GLIBC_2.2.5 __pthread_rwlock_tryrdlock F
GLIBC_2.2.5 __pthread_rwlock_trywrlock F
-GLIBC_2.2.5 __res_state F
GLIBC_2.2.5 flockfile F
GLIBC_2.2.5 ftrylockfile F
GLIBC_2.2.5 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index e5f37f4340..1b6a73ae39 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.16 __pthread_rwlock_tryrdlock F
GLIBC_2.16 __pthread_rwlock_trywrlock F
GLIBC_2.16 __pthread_unregister_cancel F
GLIBC_2.16 __pthread_unregister_cancel_restore F
-GLIBC_2.16 __res_state F
GLIBC_2.16 flockfile F
GLIBC_2.16 ftrylockfile F
GLIBC_2.16 funlockfile F
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 2/2] nptl: Remove __h_errno_location from libpthread
2021-04-23 12:58 [PATCH 0/2] Resolver-related libpthread cleanups Florian Weimer
2021-04-23 12:58 ` [PATCH 1/2] nptl: Remove __res_state from libpthread Florian Weimer
@ 2021-04-23 12:58 ` Florian Weimer
2021-04-23 16:48 ` [PATCH 0/2] Resolver-related libpthread cleanups H.J. Lu
2 siblings, 0 replies; 4+ messages in thread
From: Florian Weimer @ 2021-04-23 12:58 UTC (permalink / raw)
To: libc-alpha
The existing definition in libc will be used instead.
The symbol was moved (that is, removed) using
scripts/move-symbol-to-libc.py.
---
nptl/Makefile | 1 -
nptl/Versions | 1 -
nptl/herrno.c | 34 -------------------
.../sysv/linux/aarch64/libpthread.abilist | 1 -
.../unix/sysv/linux/alpha/libpthread.abilist | 1 -
.../unix/sysv/linux/arc/libpthread.abilist | 1 -
.../unix/sysv/linux/arm/be/libpthread.abilist | 1 -
.../unix/sysv/linux/arm/le/libpthread.abilist | 1 -
.../unix/sysv/linux/csky/libpthread.abilist | 1 -
.../unix/sysv/linux/hppa/libpthread.abilist | 1 -
.../unix/sysv/linux/i386/libpthread.abilist | 1 -
.../unix/sysv/linux/ia64/libpthread.abilist | 1 -
.../linux/m68k/coldfire/libpthread.abilist | 1 -
.../sysv/linux/m68k/m680x0/libpthread.abilist | 1 -
.../linux/microblaze/be/libpthread.abilist | 1 -
.../linux/microblaze/le/libpthread.abilist | 1 -
.../sysv/linux/mips/mips32/libpthread.abilist | 1 -
.../sysv/linux/mips/mips64/libpthread.abilist | 1 -
.../unix/sysv/linux/nios2/libpthread.abilist | 1 -
.../powerpc/powerpc32/libpthread.abilist | 1 -
.../powerpc/powerpc64/be/libpthread.abilist | 1 -
.../powerpc/powerpc64/le/libpthread.abilist | 1 -
.../sysv/linux/riscv/rv32/libpthread.abilist | 1 -
.../sysv/linux/riscv/rv64/libpthread.abilist | 1 -
.../linux/s390/s390-32/libpthread.abilist | 1 -
.../linux/s390/s390-64/libpthread.abilist | 1 -
.../unix/sysv/linux/sh/be/libpthread.abilist | 1 -
.../unix/sysv/linux/sh/le/libpthread.abilist | 1 -
.../linux/sparc/sparc32/libpthread.abilist | 1 -
.../linux/sparc/sparc64/libpthread.abilist | 1 -
.../sysv/linux/x86_64/64/libpthread.abilist | 1 -
.../sysv/linux/x86_64/x32/libpthread.abilist | 1 -
32 files changed, 65 deletions(-)
delete mode 100644 nptl/herrno.c
diff --git a/nptl/Makefile b/nptl/Makefile
index f0fc49e414..76427a5209 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -139,7 +139,6 @@ libpthread-routines = \
flockfile \
ftrylockfile \
funlockfile \
- herrno \
libpthread-compat \
nptl-init \
nptlfreeres \
diff --git a/nptl/Versions b/nptl/Versions
index fffa58433b..15bf338abc 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -228,7 +228,6 @@ libpthread {
_IO_ftrylockfile;
_IO_funlockfile;
__errno_location;
- __h_errno_location;
_exit;
flockfile;
ftrylockfile;
diff --git a/nptl/herrno.c b/nptl/herrno.c
deleted file mode 100644
index 0e1239d1b1..0000000000
--- a/nptl/herrno.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1996-2021 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
- <https://www.gnu.org/licenses/>. */
-
-#include <features.h>
-#include <netdb.h>
-#undef h_errno
-
-#include <tls.h>
-
-/* We need to have the error status variable of the resolver
- accessible in the libc. */
-extern __thread int __h_errno;
-
-
-/* When threaded, h_errno may be a per-thread variable. */
-int *
-__h_errno_location (void)
-{
- return &__h_errno;
-}
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index b18443c947..6b4a6f2098 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.17 _IO_flockfile F
GLIBC_2.17 _IO_ftrylockfile F
GLIBC_2.17 _IO_funlockfile F
GLIBC_2.17 __errno_location F
-GLIBC_2.17 __h_errno_location F
GLIBC_2.17 __pthread_register_cancel F
GLIBC_2.17 __pthread_register_cancel_defer F
GLIBC_2.17 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index babe029000..394009155a 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
index 9742e49d79..2129b19efe 100644
--- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.32 _IO_flockfile F
GLIBC_2.32 _IO_ftrylockfile F
GLIBC_2.32 _IO_funlockfile F
GLIBC_2.32 __errno_location F
-GLIBC_2.32 __h_errno_location F
GLIBC_2.32 __pthread_register_cancel F
GLIBC_2.32 __pthread_register_cancel_defer F
GLIBC_2.32 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index ab706f1737..1e0b8b78fb 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -32,7 +32,6 @@ GLIBC_2.4 _IO_flockfile F
GLIBC_2.4 _IO_ftrylockfile F
GLIBC_2.4 _IO_funlockfile F
GLIBC_2.4 __errno_location F
-GLIBC_2.4 __h_errno_location F
GLIBC_2.4 __libpthread_version_placeholder F
GLIBC_2.4 __pthread_register_cancel F
GLIBC_2.4 __pthread_register_cancel_defer F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index ab706f1737..1e0b8b78fb 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -32,7 +32,6 @@ GLIBC_2.4 _IO_flockfile F
GLIBC_2.4 _IO_ftrylockfile F
GLIBC_2.4 _IO_funlockfile F
GLIBC_2.4 __errno_location F
-GLIBC_2.4 __h_errno_location F
GLIBC_2.4 __libpthread_version_placeholder F
GLIBC_2.4 __pthread_register_cancel F
GLIBC_2.4 __pthread_register_cancel_defer F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 9040867c17..14d7d810f5 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.29 _IO_flockfile F
GLIBC_2.29 _IO_ftrylockfile F
GLIBC_2.29 _IO_funlockfile F
GLIBC_2.29 __errno_location F
-GLIBC_2.29 __h_errno_location F
GLIBC_2.29 __pthread_register_cancel F
GLIBC_2.29 __pthread_register_cancel_defer F
GLIBC_2.29 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index 0ecdb5e0c8..1add6c5ad1 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -7,7 +7,6 @@ GLIBC_2.2 _IO_flockfile F
GLIBC_2.2 _IO_ftrylockfile F
GLIBC_2.2 _IO_funlockfile F
GLIBC_2.2 __errno_location F
-GLIBC_2.2 __h_errno_location F
GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 5dc867dc7a..022dd4e2bc 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 53d4365de5..03d085a872 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -7,7 +7,6 @@ GLIBC_2.2 _IO_flockfile F
GLIBC_2.2 _IO_ftrylockfile F
GLIBC_2.2 _IO_funlockfile F
GLIBC_2.2 __errno_location F
-GLIBC_2.2 __h_errno_location F
GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index ab706f1737..1e0b8b78fb 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -32,7 +32,6 @@ GLIBC_2.4 _IO_flockfile F
GLIBC_2.4 _IO_ftrylockfile F
GLIBC_2.4 _IO_funlockfile F
GLIBC_2.4 __errno_location F
-GLIBC_2.4 __h_errno_location F
GLIBC_2.4 __libpthread_version_placeholder F
GLIBC_2.4 __pthread_register_cancel F
GLIBC_2.4 __pthread_register_cancel_defer F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 5dc867dc7a..022dd4e2bc 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index 9749474c50..b7d08bb184 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.18 _IO_flockfile F
GLIBC_2.18 _IO_ftrylockfile F
GLIBC_2.18 _IO_funlockfile F
GLIBC_2.18 __errno_location F
-GLIBC_2.18 __h_errno_location F
GLIBC_2.18 __pthread_register_cancel F
GLIBC_2.18 __pthread_register_cancel_defer F
GLIBC_2.18 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index 9749474c50..b7d08bb184 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.18 _IO_flockfile F
GLIBC_2.18 _IO_ftrylockfile F
GLIBC_2.18 _IO_funlockfile F
GLIBC_2.18 __errno_location F
-GLIBC_2.18 __h_errno_location F
GLIBC_2.18 __pthread_register_cancel F
GLIBC_2.18 __pthread_register_cancel_defer F
GLIBC_2.18 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index f970121f80..8a7fecef7c 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index f970121f80..8a7fecef7c 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index ec932a5282..f5f989f694 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.21 _IO_flockfile F
GLIBC_2.21 _IO_ftrylockfile F
GLIBC_2.21 _IO_funlockfile F
GLIBC_2.21 __errno_location F
-GLIBC_2.21 __h_errno_location F
GLIBC_2.21 __pthread_register_cancel F
GLIBC_2.21 __pthread_register_cancel_defer F
GLIBC_2.21 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 82c787c002..0ae4c8d1d3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index e7a8bfb956..503e7e6ed7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -28,7 +28,6 @@ GLIBC_2.3 _IO_flockfile F
GLIBC_2.3 _IO_ftrylockfile F
GLIBC_2.3 _IO_funlockfile F
GLIBC_2.3 __errno_location F
-GLIBC_2.3 __h_errno_location F
GLIBC_2.3 __pthread_rwlock_destroy F
GLIBC_2.3 __pthread_rwlock_init F
GLIBC_2.3 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index b18443c947..6b4a6f2098 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.17 _IO_flockfile F
GLIBC_2.17 _IO_ftrylockfile F
GLIBC_2.17 _IO_funlockfile F
GLIBC_2.17 __errno_location F
-GLIBC_2.17 __h_errno_location F
GLIBC_2.17 __pthread_register_cancel F
GLIBC_2.17 __pthread_register_cancel_defer F
GLIBC_2.17 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
index 0da414634f..a83c32e172 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.33 _IO_flockfile F
GLIBC_2.33 _IO_ftrylockfile F
GLIBC_2.33 _IO_funlockfile F
GLIBC_2.33 __errno_location F
-GLIBC_2.33 __h_errno_location F
GLIBC_2.33 __pthread_register_cancel F
GLIBC_2.33 __pthread_register_cancel_defer F
GLIBC_2.33 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 0bf079090e..9e441f912d 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.27 _IO_flockfile F
GLIBC_2.27 _IO_ftrylockfile F
GLIBC_2.27 _IO_funlockfile F
GLIBC_2.27 __errno_location F
-GLIBC_2.27 __h_errno_location F
GLIBC_2.27 __pthread_register_cancel F
GLIBC_2.27 __pthread_register_cancel_defer F
GLIBC_2.27 __pthread_rwlock_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 1cd1d570ed..23492bdf6e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 2b212017c7..e786f691dd 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -8,7 +8,6 @@ GLIBC_2.2 _IO_flockfile F
GLIBC_2.2 _IO_ftrylockfile F
GLIBC_2.2 _IO_funlockfile F
GLIBC_2.2 __errno_location F
-GLIBC_2.2 __h_errno_location F
GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index 0ecdb5e0c8..1add6c5ad1 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -7,7 +7,6 @@ GLIBC_2.2 _IO_flockfile F
GLIBC_2.2 _IO_ftrylockfile F
GLIBC_2.2 _IO_funlockfile F
GLIBC_2.2 __errno_location F
-GLIBC_2.2 __h_errno_location F
GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index 0ecdb5e0c8..1add6c5ad1 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -7,7 +7,6 @@ GLIBC_2.2 _IO_flockfile F
GLIBC_2.2 _IO_ftrylockfile F
GLIBC_2.2 _IO_funlockfile F
GLIBC_2.2 __errno_location F
-GLIBC_2.2 __h_errno_location F
GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index babe029000..394009155a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.0 _IO_flockfile F
GLIBC_2.0 _IO_ftrylockfile F
GLIBC_2.0 _IO_funlockfile F
GLIBC_2.0 __errno_location F
-GLIBC_2.0 __h_errno_location F
GLIBC_2.0 flockfile F
GLIBC_2.0 ftrylockfile F
GLIBC_2.0 funlockfile F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 53d4365de5..03d085a872 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -7,7 +7,6 @@ GLIBC_2.2 _IO_flockfile F
GLIBC_2.2 _IO_ftrylockfile F
GLIBC_2.2 _IO_funlockfile F
GLIBC_2.2 __errno_location F
-GLIBC_2.2 __h_errno_location F
GLIBC_2.2 __pthread_rwlock_destroy F
GLIBC_2.2 __pthread_rwlock_init F
GLIBC_2.2 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 985a6b5035..edc65b4cc3 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -7,7 +7,6 @@ GLIBC_2.2.5 _IO_flockfile F
GLIBC_2.2.5 _IO_ftrylockfile F
GLIBC_2.2.5 _IO_funlockfile F
GLIBC_2.2.5 __errno_location F
-GLIBC_2.2.5 __h_errno_location F
GLIBC_2.2.5 __pthread_rwlock_destroy F
GLIBC_2.2.5 __pthread_rwlock_init F
GLIBC_2.2.5 __pthread_rwlock_tryrdlock F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 1b6a73ae39..14143c6c1a 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -2,7 +2,6 @@ GLIBC_2.16 _IO_flockfile F
GLIBC_2.16 _IO_ftrylockfile F
GLIBC_2.16 _IO_funlockfile F
GLIBC_2.16 __errno_location F
-GLIBC_2.16 __h_errno_location F
GLIBC_2.16 __pthread_register_cancel F
GLIBC_2.16 __pthread_register_cancel_defer F
GLIBC_2.16 __pthread_rwlock_destroy F
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] Resolver-related libpthread cleanups
2021-04-23 12:58 [PATCH 0/2] Resolver-related libpthread cleanups Florian Weimer
2021-04-23 12:58 ` [PATCH 1/2] nptl: Remove __res_state from libpthread Florian Weimer
2021-04-23 12:58 ` [PATCH 2/2] nptl: Remove __h_errno_location " Florian Weimer
@ 2021-04-23 16:48 ` H.J. Lu
2 siblings, 0 replies; 4+ messages in thread
From: H.J. Lu @ 2021-04-23 16:48 UTC (permalink / raw)
To: Florian Weimer; +Cc: GNU C Library
On Fri, Apr 23, 2021 at 8:17 AM Florian Weimer via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> Ip lan to push this shortly because I think it's non-controversial and
> it's more network-related than thread-related.
>
> __errno_location should receive the same treatment, but there could be
> references from assembler code, so I think it's best to delay that until
> all code is gone from libpthread.
>
> Tested on i686-linux-gnu and x86_64-linux-gnu. Built with
> build-many-glibcs.py.
>
> Thanks,
> Florian
>
> Florian Weimer (2):
> nptl: Remove __res_state from libpthread
> nptl: Remove __h_errno_location from libpthread
>
> nptl/Makefile | 2 --
> nptl/Versions | 2 --
> nptl/herrno.c | 34 -------------------
> nptl/res.c | 26 --------------
> .../sysv/linux/aarch64/libpthread.abilist | 2 --
> .../unix/sysv/linux/alpha/libpthread.abilist | 2 --
> .../unix/sysv/linux/arc/libpthread.abilist | 2 --
> .../unix/sysv/linux/arm/be/libpthread.abilist | 2 --
> .../unix/sysv/linux/arm/le/libpthread.abilist | 2 --
> .../unix/sysv/linux/csky/libpthread.abilist | 2 --
> .../unix/sysv/linux/hppa/libpthread.abilist | 2 --
> .../unix/sysv/linux/i386/libpthread.abilist | 2 --
> .../unix/sysv/linux/ia64/libpthread.abilist | 2 --
> .../linux/m68k/coldfire/libpthread.abilist | 2 --
> .../sysv/linux/m68k/m680x0/libpthread.abilist | 2 --
> .../linux/microblaze/be/libpthread.abilist | 2 --
> .../linux/microblaze/le/libpthread.abilist | 2 --
> .../sysv/linux/mips/mips32/libpthread.abilist | 2 --
> .../sysv/linux/mips/mips64/libpthread.abilist | 2 --
> .../unix/sysv/linux/nios2/libpthread.abilist | 2 --
> .../powerpc/powerpc32/libpthread.abilist | 2 --
> .../powerpc/powerpc64/be/libpthread.abilist | 2 --
> .../powerpc/powerpc64/le/libpthread.abilist | 2 --
> .../sysv/linux/riscv/rv32/libpthread.abilist | 2 --
> .../sysv/linux/riscv/rv64/libpthread.abilist | 2 --
> .../linux/s390/s390-32/libpthread.abilist | 2 --
> .../linux/s390/s390-64/libpthread.abilist | 2 --
> .../unix/sysv/linux/sh/be/libpthread.abilist | 2 --
> .../unix/sysv/linux/sh/le/libpthread.abilist | 2 --
> .../linux/sparc/sparc32/libpthread.abilist | 2 --
> .../linux/sparc/sparc64/libpthread.abilist | 2 --
> .../sysv/linux/x86_64/64/libpthread.abilist | 2 --
> .../sysv/linux/x86_64/x32/libpthread.abilist | 2 --
> 33 files changed, 122 deletions(-)
> delete mode 100644 nptl/herrno.c
> delete mode 100644 nptl/res.c
>
> --
> 2.30.2
>
LGTM.
Thanks.
--
H.J.
^ permalink raw reply [flat|nested] 4+ messages in thread