From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 13 Nov 2025 22:45:12 +0000 (+0100)
Subject: htl: Remove errno and herrno from libpthread
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91fb9914d867320d65a2abe284fb623d91ae5efb;p=thirdparty%2Fglibc.git

htl: Remove errno and herrno from libpthread

libc already has them.
---

diff --git a/htl/Makefile b/htl/Makefile
index 4307c27203..9fde4174bb 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -34,7 +34,6 @@ libpthread-routines := \
   pt-getname-np \
   pt-setname-np \
   cancellation \
-  herrno \
   # libpthread-routine
 
 headers := \
diff --git a/htl/Versions b/htl/Versions
index 4da6204f88..349ab4fe4b 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -311,9 +311,6 @@ libc {
 }
 
 libpthread {
-  GLIBC_2.2.6 {
-    __errno_location; __h_errno_location;
-  }
   GLIBC_2.12 {
     pthread_atfork;
 
diff --git a/htl/herrno.c b/htl/herrno.c
deleted file mode 100644
index 98012e5bfb..0000000000
--- a/htl/herrno.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1996-2025 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/htl/Makefile b/sysdeps/htl/Makefile
index ef156f1315..12bb54ebf4 100644
--- a/sysdeps/htl/Makefile
+++ b/sysdeps/htl/Makefile
@@ -1,7 +1,3 @@
-ifeq ($(subdir),htl)
-libpthread-sysdep_routines += errno-loc
-endif
-
 ifeq ($(subdir),rt)
 librt-sysdep_routines += timer_routines
 endif
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index b0516ddbc1..c55b78b01c 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -11,8 +11,6 @@ GLIBC_2.12 pthread_spin_init F
 GLIBC_2.12 pthread_spin_lock F
 GLIBC_2.12 pthread_spin_trylock F
 GLIBC_2.12 pthread_spin_unlock F
-GLIBC_2.2.6 __errno_location F
-GLIBC_2.2.6 __h_errno_location F
 GLIBC_2.21 pthread_hurd_cond_timedwait_np F
 GLIBC_2.21 pthread_hurd_cond_wait_np F
 GLIBC_2.32 call_once F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 5724c88a6b..77d9a6601d 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -1,5 +1,3 @@
-GLIBC_2.38 __errno_location F
-GLIBC_2.38 __h_errno_location F
 GLIBC_2.38 __pthread_spin_destroy F
 GLIBC_2.38 __pthread_spin_init F
 GLIBC_2.38 __pthread_spin_lock F