From patchwork Sat Jan 4 19:40:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1217632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108448-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="nug5IX9Q"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47qsZG20syz9sPJ for ; Sun, 5 Jan 2020 06:40:37 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=UYa wwqkDbKLHJUnNmZs6XSp1Gwpu5Met3fNKm2vZ+5bysZwotn+IN1bAFQy04uTtysF Pf8Sd3xuyNo1zDPU5DYodUvvQhwQ+hUo6Q5xwAEwcPCC6GhDr21prcToF1YDsoA+ nyAIplIty9vdZFip32INiD19bY1RcJ0dY4h4SA3Y= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=zVukLfGV9 raMAKAyn7WwKcvotQg=; b=nug5IX9QJTBveDIdHBWZ5/LWl0oQsl4KjDnz+WE8u S/lSFcHLec1n84Doqrzye8NEadHFGE74qbybpyzeErStBNcELoTClfRplsn1wv0V 7MkVZ/+kdaHYgNyv4rIuAHHM6BliwmWyR0fu4h48w/uV1zNcFe1rJe8iPBW8Ydi+ WI= Received: (qmail 12884 invoked by alias); 4 Jan 2020 19:40:30 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 12876 invoked by uid 89); 4 Jan 2020 19:40:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=Hurd, hurd, sk:__errno X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] htl: Add __errno_location and __h_errno_location Date: Sat, 4 Jan 2020 20:40:21 +0100 Message-Id: <20200104194021.944983-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 As explained on https://sourceware.org/ml/libc-alpha/2020-01/msg00049.html the presence of __errno_location in libpthread.so on GNU/Linux makes libpthread getting linked in for libstdc++. This aligns on that behavior, to avoid issues that only GNU/Hurd would get. --- htl/Makefile | 1 + htl/Versions | 1 + htl/herrno.c | 34 +++++++++++++++++++++++ sysdeps/htl/Makefile | 4 +++ sysdeps/mach/hurd/i386/libpthread.abilist | 2 ++ 5 files changed, 42 insertions(+) create mode 100644 htl/herrno.c diff --git a/htl/Makefile b/htl/Makefile index e091077a28..b9d3831dd9 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -134,6 +134,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ shm-directory \ \ cthreads-compat \ + herrno \ $(SYSDEPS) headers := \ diff --git a/htl/Versions b/htl/Versions index c5a616da10..1c306acf5c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -29,6 +29,7 @@ libc { libpthread { GLIBC_2.2.6 { _IO_flockfile; _IO_ftrylockfile; _IO_funlockfile; + __errno_location; __h_errno_location; } GLIBC_2.12 { __pthread_errorcheck_mutexattr; __pthread_recursive_mutexattr; diff --git a/htl/herrno.c b/htl/herrno.c new file mode 100644 index 0000000000..66174a03e9 --- /dev/null +++ b/htl/herrno.c @@ -0,0 +1,34 @@ +/* Copyright (C) 1996-2020 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 + . */ + +#include +#include +#undef h_errno + +#include + +/* 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 12bb54ebf4..ef156f1315 100644 --- a/sysdeps/htl/Makefile +++ b/sysdeps/htl/Makefile @@ -1,3 +1,7 @@ +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 4c7d06d073..0ede90859c 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -145,5 +145,7 @@ GLIBC_2.12 sem_wait F GLIBC_2.2.6 _IO_flockfile F GLIBC_2.2.6 _IO_ftrylockfile F GLIBC_2.2.6 _IO_funlockfile 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